X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fopnfv%2Fopnfv-docs.yml;h=3574b398836cc4d8f0d99f5a464199214450db9c;hb=refs%2Fchanges%2F69%2F5069%2F1;hp=1a93e3e5f371fc939cc4009b9e7758f0667b5042;hpb=63d70285a1b752b8272d093fa867c84f501841bb;p=releng.git

diff --git a/jjb/opnfv/opnfv-docs.yml b/jjb/opnfv/opnfv-docs.yml
index 1a93e3e5f..3574b3988 100644
--- 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,7 +8,8 @@
     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)
@@ -21,17 +22,7 @@
 ########################
 
 - job-template:
-    name: 'opnfv-docs-verify'
-
-    node: master
-
-    project-type: freestyle
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    name: 'opnfv-docs-verify-{stream}'
 
     parameters:
         - project-parameter:
@@ -45,10 +36,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -62,16 +49,43 @@
                 - comment-added-contains-event:
                     comment-contains-value: 'reverify'
             projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'copper'
+              - project-compare-type: 'REG_EXP'
+#Left out arno projects oscar|octopus|functest|genesis
+                project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf|functest'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/master'
                 file-paths:
                   - compare-type: ANT
                     pattern: 'docs/**'
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng'
+
+    builders:
+        - upload-review-docs
+
+- job-template:
+    name: 'opnfv-docs-merge-{stream}'
+
+    parameters:
+        - project-parameter:
+            project: $GERRIT_PROJECT
+        - gerrit-parameter:
+            branch: 'master'
+
+    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'
+            projects:
+              - project-compare-type: 'REG_EXP'
+                project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sdnvpn|sfc|vnf_forwarding_graph|enfv|pinpoint|pharos|opnfvdocs|cperf|functest'
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/master'
@@ -80,5 +94,4 @@
                     pattern: 'docs/**'
 
     builders:
-       - shell:
-           !include-raw ../../utils/docu-build-new.sh
+        - upload-merged-docs