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

diff --git a/jjb/opnfvdocs/opnfvdocs.yml b/jjb/opnfvdocs/opnfvdocs.yml
index 2f927d5ce..fc825ff64 100644
--- a/jjb/opnfvdocs/opnfvdocs.yml
+++ b/jjb/opnfvdocs/opnfvdocs.yml
@@ -1,94 +1,51 @@
+########################
+# Job configuration for opnfvdocs
+########################
 - project:
+
     name: opnfvdocs
+
+    project: '{name}'
+
     jobs:
+        - 'opnfvdocs-verify-shellcheck-{stream}'
+        - 'opnfvdocs-merge-shellcheck-{stream}'
         - 'opnfvdocs-daily-{stream}'
-        - 'opnfvdocs-merge'
-        - 'opnfvdocs-verify-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-helium)
-    # branch:    branch (eg. stable/helium)
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
             gs-pathname: ''
-        - stable-arno:
-            branch: 'stable/arno'
-            gs-pathname: '/arno'
+            disabled: false
+        - danube:
+            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: ''
+            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."
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - 'opnfvdocs-{stream}'
-
-    builders:
-        - shell:
-            !include-raw docu-build.sh
-
-- job-template:
-    name: 'opnfvdocs-verify-{stream}'
-
-    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: '{branch}'
     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:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -100,86 +57,82 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
             projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'opnfvdocs'
+              - 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
+        - check-bash-syntax
 
 - job-template:
-    name: 'opnfvdocs-merge'
-
-    node: gce-opnfv-docker-1
-
-    # builder-merge job to run JJB update
-    #
-    # This job's purpose is to update all the JJB
+    name: 'opnfvdocs-merge-shellcheck-{stream}'
 
-    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: $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:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - change-merged-event
                 - comment-added-contains-event:
                     comment-contains-value: 'remerge'
             projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'opnfvdocs'
+              - project-compare-type: 'REG_EXP'
+                project-pattern: '{project}'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
 
     builders:
-        - shell:
-            !include-raw docu-build.sh
+        - check-bash-syntax
+
+- job-template:
+    name: 'opnfvdocs-daily-{stream}'
+
+    disabled: true
 
-########################
-# parameter macros
-########################
-- parameter:
-    name: opnfvdocs-parameter
     parameters:
+        - project-parameter:
+            project: '{project}'
+            branch: '{branch}'
         - string:
-            name: GS_PATHNAME
-            default: '{gs-pathname}'
-            description: "Version directory where the opnfv documents will be stored in gs repository"
+            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."
 
-########################
-# trigger macros
-########################
-- trigger:
-    name: 'opnfvdocs-master'
-    triggers:
-        - pollscm: "H 9 * * *"
+    scm:
+        - git-scm
 
-- trigger:
-    name: 'opnfvdocs-stable-arno'
     triggers:
-        - pollscm: "H 21 * * *"
+        - timed: '0 H/6 * * *'
+
+    builders:
+        - build-html-and-pdf-docs-output
+#        - upload-generated-docs-to-opnfv-artifacts