X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-scenario.yaml;h=0e8d3f034bb8d552a0e21ab5b386965c3a1540ab;hb=a4a44c350f451bd40a6c61ae44ca76e9f0657ef8;hp=c1e43456af0ebe63d871c60ab8d474b99a7cc7f4;hpb=7e507875f63896df2bfd2e3efe33da2a9521f6ad;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index c1e43456..0e8d3f03 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -51,6 +51,9 @@
       - centos7:
           disabled: 'true'
 
+    ci-loop:
+      - daily
+
     deploy-scenario:
       - k8-calico-nofeature:
           installer-type: kubespray
@@ -64,28 +67,31 @@
           installer-type: kubespray
       - k8-multus-nofeature:
           installer-type: kubespray
+      - os-nosdn-nofeature:
+          installer-type: kolla
 
     type:
       - baremetal:
           slave-label: 'baremetal-deploy'
           yardstick-dispatcher: 'influxdb'
+          provisioner-type: 'bifrost'
 
     phase:
       - deploy:
-          build-timeout: 60
+          build-timeout: 90
       - functest:
-          build-timeout: 120
+          build-timeout: 135
       - yardstick:
           build-timeout: 30
       - promote:
           build-timeout: 5
 
     jobs:
-      - '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
-      - 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
+      - '{deploy-scenario}-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
+      - 'scenario-{distro}-{phase}-{type}-{ci-loop}-{stream}'
 
 - job-template:
-    name: '{deploy-scenario}-periodic-{distro}-{type}-{stream}'
+    name: '{deploy-scenario}-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
 
     project-type: multijob
 
@@ -114,6 +120,10 @@
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
+      - string:
+          name: PROVISIONER_TYPE
+          default: '{provisioner-type}'
+          description: 'Provisioner to use for provisioning nodes'
       - string:
           name: INSTALLER_TYPE
           default: '{installer-type}'
@@ -142,6 +152,7 @@
           blocking-jobs:
             - 'cloud-infra-periodic-engine-.*'
             - 'k8-.*'
+            - 'os-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -150,7 +161,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 210
+          timeout: 245
       - fix-workspace-permissions
 
     scm:
@@ -166,17 +177,18 @@
 
     builders:
       - description-setter:
-          description: $INSTALLER_TYPE
+          description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
       - multijob:
           name: deploy
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{distro}-deploy-{type}-{stream}'
+            - name: 'scenario-{distro}-deploy-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 CLEANUP=$CLEANUP
@@ -188,11 +200,12 @@
           name: functest
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{distro}-functest-{type}-{stream}'
+            - name: 'scenario-{distro}-functest-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
@@ -205,11 +218,12 @@
           name: yardstick
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{distro}-yardstick-{type}-{stream}'
+            - name: 'scenario-{distro}-yardstick-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
@@ -222,11 +236,12 @@
           name: promote
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-periodic-{distro}-promote-{type}-{stream}'
+            - name: 'scenario-{distro}-promote-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
+                PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
@@ -237,7 +252,7 @@
               abort-all-job: true
 
 - job-template:
-    name: 'scenario-periodic-{distro}-{phase}-{type}-{stream}'
+    name: 'scenario-{distro}-{phase}-{type}-{ci-loop}-{stream}'
 
     disabled: false
 
@@ -270,6 +285,10 @@
           name: DEPLOY_SCENARIO
           default: 'k8-calico-nofeature'
           description: 'Scenario to deploy and test'
+      - string:
+          name: PROVISIONER_TYPE
+          default: 'bifrost'
+          description: 'Provisioner to use for provisioning nodes'
       - string:
           name: INSTALLER_TYPE
           default: 'kubespray'
@@ -309,7 +328,7 @@
 
     builders:
       - description-setter:
-          description: $INSTALLER_TYPE - $DEPLOY_SCENARIO
+          description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
       - 'scenario-{phase}-macro'
 
 # vim: set ts=2 sw=2 expandtab: