X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfvdocs%2Fopnfvdocs.yml;h=5f08f69a4408302bcf69e1ff3a32d23472a209f6;hb=7bf9e576ff0fffdac04b5892e0e41b63c0735d4e;hp=da9f13cf408e6785f3d071197bab4ae76b7b814d;hpb=90384095dba59ec8efcb0a576bc3522b66020cb2;p=releng.git

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index da9f13cf4..5f08f69a4 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -1,185 +1,115 @@
+---
+########################
+# Job configuration for opnfvdocs
+########################
 - project:
+
     name: opnfvdocs
+
+    project: '{name}'
+
     jobs:
-        - 'opnfvdocs-daily-{stream}'
-        - 'opnfvdocs-merge'
-        - 'opnfvdocs-verify'
+      - 'opnfvdocs-verify-shellcheck-{stream}'
+      - 'opnfvdocs-merge-shellcheck-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
     stream:
-        - master:
-            branch: 'master'
-            gs-pathname: ''
-        - stable-arno:
-            branch: 'stable/arno'
-            gs-pathname: '/arno'
+      - 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
 
-    project: 'opnfvdocs'
+########################
+# job templates
+########################
 
 - job-template:
-    name: 'opnfvdocs-daily-{stream}'
-
-    node: gce-opnfv-docker-1
-
-    # Job template for daily builders
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable)
-    #     branch:    branch (eg. stable)
-
-    project-type: freestyle
+    name: 'opnfvdocs-verify-shellcheck-{stream}'
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+    disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - opnfvdocs-parameter:
-            gs-pathname: '{gs-pathname}'
-
-    scm:
-        - git-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - 'opnfvdocs-{stream}'
-
-    builders:
-        - shell:
-            !include-raw docu-build.sh
-
-- job-template:
-    name: 'opnfvdocs-verify'
+      - 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."
 
-    node: gce-opnfv-docker-1
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+      - git-scm-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: 'ANT'
-                project-pattern: 'opnfvdocs'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
+      - 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:
-        - shell:
-            !include-raw docu-build.sh
+      - lint-bash-code
 
 - job-template:
-    name: 'opnfvdocs-merge'
+    name: 'opnfvdocs-merge-shellcheck-{stream}'
 
-    node: gce-opnfv-docker-1
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: 'master'
+      - 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:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
-
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+      - git-scm
 
     triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'opnfvdocs'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+      - 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}'
 
     builders:
-        - shell:
-            !include-raw docu-build.sh
-
-########################
-# parameter macros
-########################
-- parameter:
-    name: opnfvdocs-parameter
-    parameters:
-        - string:
-            name: GS_PATHNAME
-            default: '{gs-pathname}'
-            description: "Version directory where the opnfv documents will be stored in gs repository"
-
-########################
-# trigger macros
-########################
-- trigger:
-    name: 'opnfvdocs-master'
-    triggers:
-        - pollscm: "H 9 * * *"
-
-- trigger:
-    name: 'opnfvdocs-stable-arno'
-    triggers:
-        - pollscm: "H 21 * * *"
+      - lint-bash-code