X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fmultisite%2Fmultisite.yml;h=21b973093f628f602fcd628124eca5cfe24a043e;hb=0b858905a188c049a7f25c86647256b4b0ea091c;hp=f92a4c1bf79089aaf5701e69652016262d1b428c;hpb=a54a38f6c3304cf0a4cd01b08d0b8c91bb446e5f;p=releng.git

diff --git a/jjb/multisite/multisite.yml b/jjb/multisite/multisite.yml
index f92a4c1bf..21b973093 100644
--- a/jjb/multisite/multisite.yml
+++ b/jjb/multisite/multisite.yml
@@ -10,18 +10,27 @@
     jobs:
         - 'multisite-verify-{stream}'
         - 'multisite-kingbird-daily-{stream}'
+        - 'multisite-kingbird-deploy-{stream}'
 
     stream:
         - master:
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
+            timed: '@midnight'
+        - colorado:
+            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}'
@@ -70,14 +79,7 @@
 
     disabled: '{obj:disabled}'
 
-    concurrent: true
-
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 3
-            max-per-node: 2
-            option: 'project'
+    concurrent: false
 
     parameters:
         - project-parameter:
@@ -88,6 +90,9 @@
             name: KINGBIRD_LOG_FILE
             default: $WORKSPACE/kingbird.log
         - 'intel-virtual6-defaults'
+        - string:
+            name: DEPLOY_SCENARIO
+            default: 'os-nosdn-multisite-ha'
 
     scm:
         - gerrit-trigger-scm:
@@ -96,11 +101,52 @@
             choosing-strategy: 'default'
 
     triggers:
-         - timed: '@midnight'
+         - timed: '{timed}'
+
+    builders:
+        - trigger-builds:
+            - project: 'multisite-kingbird-deploy-{stream}'
+              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
+              predefined-parameters:
+                FUNCTEST_SUITE_NAME=multisite
+              same-node: true
+              block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+
+- job-template:
+    name: 'multisite-kingbird-deploy-{stream}'
+
+    concurrent: false
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            choosing-strategy: 'gerrit'
 
     builders:
         - 'multisite-kingbird-deploy'
         - 'multisite-kingbird-log-upload'
+
 ########################
 # builder macros
 ########################