X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fmultisite%2Fmultisite.yml;h=6b640698336a6db62556b95317af72c623e3ff3f;hb=690ce5838508a651d5cf06c89533d5b69ac999ec;hp=00b211ceb6ce4ef5fc03d6bf4cab10e7daaf0d80;hpb=912a8810e8c04bbe8488ebe4121ada643bd41e91;p=releng.git

diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml
index 00b211ceb..6b6406983 100644
--- a/jjb/multisite/multisite.yml
+++ b/jjb/multisite/multisite.yml
@@ -17,12 +17,20 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
+            timed: '@midnight'
+        - danube:
+            branch: 'stable/{stream}'
+            gs-pathname: '/{stream}'
+            disabled: false
+            timed: ''
 
 - job-template:
     name: 'multisite-verify-{stream}'
 
     disabled: '{obj:disabled}'
 
+    concurrent: true
+
     parameters:
         - project-parameter:
             project: '{project}'
@@ -31,13 +39,11 @@
         - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     triggers:
         - gerrit:
+            server-name: 'gerrit.opnfv.org'
             trigger-on:
                 - patchset-created-event:
                     exclude-drafts: 'false'
@@ -87,13 +93,10 @@
             default: 'os-nosdn-multisite-ha'
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'default'
+        - git-scm
 
     triggers:
-         - timed: '@midnight'
+         - timed: '{timed}'
 
     builders:
         - trigger-builds:
@@ -101,17 +104,6 @@
               current-parameters: true
               same-node: true
               block: true
-        - trigger-builds:
-            - project: 'functest-fuel-virtual-suite-{stream}'
-              current-parameters: true
-              predefined-parameters:
-                FUNCTEST_SUITE_NAME=healthcheck
-              same-node: true
-              block: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
         - trigger-builds:
             - project: 'functest-fuel-virtual-suite-{stream}'
               current-parameters: true
@@ -130,10 +122,7 @@
     concurrent: false
 
     scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: ''
-            choosing-strategy: 'gerrit'
+        - git-scm-gerrit
 
     builders:
         - 'multisite-kingbird-deploy'