X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfvdocs%2Fopnfvdocs.yml;h=5f08f69a4408302bcf69e1ff3a32d23472a209f6;hb=d8dcf5c1de34458f1f6760742c1e3df57f403041;hp=cbb8f95453aaa8a257eae7e01417082a7a6604ec;hpb=28a9e274ffe85aac6d80cf00029e1d1a2f0a39f8;p=releng.git

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index cbb8f9545..5f08f69a4 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -1,3 +1,4 @@
+---
 ########################
 # Job configuration for opnfvdocs
 ########################
@@ -8,151 +9,107 @@
     project: '{name}'
 
     jobs:
-        - 'opnfvdocs-verify-{stream}'
-        - 'opnfvdocs-merge-{stream}'
-        - 'opnfvdocs-daily-{stream}'
+      - 'opnfvdocs-verify-shellcheck-{stream}'
+      - 'opnfvdocs-merge-shellcheck-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-        - brahmaputra:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - euphrates:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 ########################
 # job templates
 ########################
 
 - job-template:
-    name: 'opnfvdocs-verify-{stream}'
+    name: 'opnfvdocs-verify-shellcheck-{stream}'
 
-    parameters:
-        - project-parameter:
-            project: $GERRIT_PROJECT
-        - gerrit-parameter:
-            branch: '{branch}'
-        - string:
-            name: GIT_CLONE_BASE
-            default: ssh://gerrit.opnfv.org:29418
-            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'
-
-    triggers:
-        - gerrit:
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
-
-    builders:
-        - build-opnfv-composite-docs
-        - upload-under-review-docs-to-opnfv-artifacts
-        - report-docs-build-result-to-gerrit
-
-- job-template:
-    name: 'opnfvdocs-merge-{stream}'
+    disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: $GERRIT_PROJECT
-        - gerrit-parameter:
-            branch: '{branch}'
-        - string:
-            name: GIT_CLONE_BASE
-            default: ssh://gerrit.opnfv.org:29418
-            description: "Used for overriding the GIT URL coming from parameters macro."
-        - string:
-            name: GS_URL
-            default: '$GS_BASE{gs-pathname}'
-            description: "Directory where the build artifact will be located upon the completion of the build."
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+      - string:
+          name: GIT_CLONE_BASE
+          default: ssh://gerrit.opnfv.org:29418
+          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:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'REG_EXP'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
 
     builders:
-        - build-opnfv-composite-docs
-        - upload-generated-docs-to-opnfv-artifacts
-        - report-docs-build-result-to-gerrit
-        - remove-old-docs-from-opnfv-artifacts
+      - lint-bash-code
 
 - job-template:
-    name: 'opnfvdocs-daily-{stream}'
+    name: 'opnfvdocs-merge-shellcheck-{stream}'
 
-    disabled: true
+    disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - string:
-            name: GS_URL
-            default: '$GS_BASE{gs-pathname}'
-            description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            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.'
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+      - string:
+          name: GIT_CLONE_BASE
+          default: ssh://gerrit.opnfv.org:29418
+          description: "Used for overriding the GIT URL coming from parameters macro."
+      - string:
+          name: GS_URL
+          default: '$GS_BASE{gs-pathname}'
+          description: "Directory where the build artifact will be located upon\
+            \ the completion of the build."
 
     scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+      - git-scm
 
     triggers:
-        - timed: '0 H/6 * * *'
-
-    builders:
-        - build-opnfv-composite-docs
-#        - upload-generated-docs-to-opnfv-artifacts
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'REG_EXP'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
 
-- builder:
-    name: build-opnfv-composite-docs
     builders:
-        - shell: |
-            #!/bin/bash -e
-            export PATH=$PATH:/usr/local/bin/
-            GERRIT_COMMENT=gerrit_comment.txt ./build-composite.sh
+      - lint-bash-code