Merge "Add zte slave to pod-config"

[releng.git] / jjb / genesis / genesis-docs.yml

diff --git a/jjb/genesis/genesis-docs.yml b/jjb/genesis/genesis-docs.yml
index 92fd6d2..fa8b35a 100644 (file)
--- a/jjb/genesis/genesis-docs.yml
+++ b/jjb/genesis/genesis-docs.yml
@@ -27,19 +27,11 @@
 
     node: gce-opnfv-docker-1
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
         - string:
             name: GS_PATHNAME
             default: '{gs-pathname}'
@@ -51,10 +43,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -66,7 +54,7 @@
                 project-pattern: 'genesis'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
                 file-paths:
                     - compare-type: ANT
                       pattern: 'common/docs/**'
@@ -86,26 +74,18 @@
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh
 
 - job-template:
     name: 'genesis-verify-docs-{stream}'
 
     node: gce-opnfv-docker-1
 
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -113,10 +93,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -135,7 +111,7 @@
                 project-pattern: 'genesis'
                 branches:
                     - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                      branch-pattern: '**/{branch}'
                 file-paths:
                     - compare-type: ANT
                       pattern: 'common/docs/**'
@@ -155,5 +131,5 @@
 
     builders:
         - shell:
-            !include-raw docu-build.sh
+            !include-raw ../opnfvdocs/docu-build.sh