X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfvdocs%2Fopnfvdocs.yml;h=fc825ff6439e8af5acad86e17ae5d5a746251aa9;hb=aabaa4dec645605fd1c3c0b0ffdf7341b4013fec;hp=724ef6aab24b5d45ada74625585297256c620fbe;hpb=cc8c74caed5b1e767f351bbb83adc53d0b3b00fd;p=releng.git

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 724ef6aab..fc825ff64 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -8,8 +8,8 @@
     project: '{name}'
 
     jobs:
-        - 'opnfvdocs-verify-{stream}'
-        - 'opnfvdocs-merge-{stream}'
+        - 'opnfvdocs-verify-shellcheck-{stream}'
+        - 'opnfvdocs-merge-shellcheck-{stream}'
         - 'opnfvdocs-daily-{stream}'
 
     stream:
@@ -17,7 +17,7 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
-        - colorado:
+        - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
@@ -27,14 +27,13 @@
 ########################
 
 - job-template:
-    name: 'opnfvdocs-verify-{stream}'
+    name: 'opnfvdocs-verify-shellcheck-{stream}'
 
     disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_CLONE_BASE
@@ -42,10 +41,7 @@
             description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
@@ -66,19 +62,23 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+            skip-vote:
+                successful: true
+                failed: true
+                unstable: true
+                notbuilt: true
 
     builders:
         - check-bash-syntax
 
 - job-template:
-    name: 'opnfvdocs-merge-{stream}'
+    name: 'opnfvdocs-merge-shellcheck-{stream}'
 
     disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
-        - gerrit-parameter:
             branch: '{branch}'
         - string:
             name: GIT_CLONE_BASE
@@ -90,10 +90,7 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm
 
     triggers:
         - gerrit:
@@ -120,6 +117,7 @@
     parameters:
         - project-parameter:
             project: '{project}'
+            branch: '{branch}'
         - string:
             name: GS_URL
             default: '$GS_BASE{gs-pathname}'
@@ -128,16 +126,9 @@
             name: GIT_CLONE_BASE
             default: ssh://gerrit.opnfv.org:29418
             description: "Used for overriding the GIT URL coming from parameters macro."
-        - string:
-            name: GERRIT_BRANCH
-            default: '{branch}'
-            description: 'Specify the branch in this way in order to be able to use build-opnfv-composite-docs builder.'
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+        - git-scm
 
     triggers:
         - timed: '0 H/6 * * *'
@@ -145,4 +136,3 @@
     builders:
         - build-html-and-pdf-docs-output
 #        - upload-generated-docs-to-opnfv-artifacts
-