Merge "Trigger test unit execution on verify + Published for jenkins"

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

diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 1faf553..307c1db 100644 (file)
--- a/jjb/opnfv/opnfv-docs.yml
+++ b/jjb/opnfv/opnfv-docs.yml
@@ -1,5 +1,5 @@
 ########################
-# Job configuration for dovetail-docs
+# Job configuration for opnfv-docs
 ########################
 - project:
 
@@ -8,36 +8,35 @@
     project: opnfv-docs
 
     jobs:
-        - 'opnfv-docs-verify'
+        - 'opnfv-docs-verify-{stream}'
+        - 'opnfv-docs-merge-{stream}'
 
-    # stream:    branch with - in place of / (eg. stable-arno)
-    # branch:    branch (eg. stable/arno)
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
+            doc-version: ''
+            gs-pathname: ''
+            disabled: false
+        - colorado:
+            branch: 'stable/{stream}'
+            doc-version: '2.0'
+            gs-pathname: '/{stream}/{doc-version}'
+            disabled: false
 
 ########################
 # job templates
 ########################
 
 - job-template:
-    name: 'opnfv-docs-verify'
+    name: 'opnfv-docs-verify-{stream}'
 
-    node: master
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: '{obj:disabled}'
 
     parameters:
         - project-parameter:
             project: $GERRIT_PROJECT
         - gerrit-parameter:
-            branch: 'master'
+            branch: '{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -45,10 +44,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -62,15 +57,64 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
             projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: 'copper|releng'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
+                - project-compare-type: 'ANT'
+                  project-pattern: '*'
+                  branches:
+                      - branch-compare-type: 'ANT'
+                        branch-pattern: '**/{branch}'
+                  file-paths:
+                      - compare-type: ANT
+                        pattern: docs/**
+                      - compare-type: ANT
+                        pattern: yardstick/**
+
+    builders:
+        - upload-review-docs
+
+- job-template:
+    name: 'opnfv-docs-merge-{stream}'
+
+    disabled: '{obj:disabled}'
+
+    parameters:
+        - project-parameter:
+            project: $GERRIT_PROJECT
+        - gerrit-parameter:
+            branch: '{branch}'
+        - 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: GERRIT_REFSPEC
+            default: 'refs/heads/{branch}'
+            description: "JJB configured GERRIT_REFSPEC parameter"
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    triggers:
+        - gerrit:
+            trigger-on:
+                - change-merged-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'remerge'
+                - comment-added-contains-event:
+                    comment-contains-value: 'rebuild docs'
+            projects:
+                - project-compare-type: 'ANT'
+                  project-pattern: '*'
+                  branches:
+                      - branch-compare-type: 'ANT'
+                        branch-pattern: '**/{branch}'
+                  file-paths:
+                      - compare-type: ANT
+                        pattern: docs/**
+                      - compare-type: ANT
+                        pattern: yardstick/**
 
     builders:
-       - shell:
-           !include-raw ../../utils/docu-build-new.sh
+        - upload-merged-docs