Merge "airship update upstream test status"

diff --git a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
index 93fe54d321ff9cd0f06044b2d14f1875ce6513b2..302afeeec4c8b3c7d2dbe597894fcadfda166e88 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
+++ b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
@@ -59,22 +59,30 @@
           openstack-branch: '{stream}'
 
     distro:
-      - ubuntu1804:
-          disabled: 'false'
+      - ubuntu1804
 
     deploy-scenario:
       - os-nosdn-nofeature
 
-    ci-loop:
-      - daily
-
     type:
       - baremetal:
           pod-name: est-baremetal
+          slave-label: baremetal-deploy
           provisioner-type: bifrost
           installer-type: kolla
-          slave-label: baremetal-deploy
+          test-suite: smoke
+          yardstick-dispatcher: 'influxdb'
+          ci-loop: daily
+          trigger-on: '@daily'
+      - virtual:
+          pod-name: est-virtual
+          slave-label: vpod
+          provisioner-type: bifrost
+          installer-type: kolla
+          test-suite: healthcheck
           yardstick-dispatcher: 'influxdb'
+          ci-loop: periodic
+          trigger-on: '0 */8 * * *'
 
     phase:
       - deploy:
@@ -108,6 +116,10 @@
           name: SLAVE_LABEL
           default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
+      - string:
+          name: CI_LOOP
+          default: '{ci-loop}'
+          description: 'Type of the deployment'
       - string:
           name: DISTRO
           default: '{distro}'
@@ -138,7 +150,7 @@
           description: 'Scenario to deploy and test'
       - string:
           name: TEST_SUITE
-          default: 'smoke'
+          default: '{test-suite}'
           description: 'Test suite to run'
       - string:
           name: YARDSTICK_DISPATCHER
@@ -177,7 +189,7 @@
           clean_before: false
 
     triggers:
-      - timed: '@daily'
+      - timed: '{trigger-on}'
 
     builders:
       - description-setter:
@@ -189,6 +201,7 @@
             - name: 'openstack-deploy-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
+                CI_LOOP=$CI_LOOP
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
@@ -208,6 +221,7 @@
             - name: 'openstack-functest-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
+                CI_LOOP=$CI_LOOP
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 OPENSTACK_VERSION=$OPENSTACK_VERSION
@@ -227,6 +241,7 @@
             - name: 'openstack-yardstick-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
+                CI_LOOP=$CI_LOOP
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 OPENSTACK_VERSION=$OPENSTACK_VERSION
@@ -246,6 +261,7 @@
             - name: 'openstack-promote-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
+                CI_LOOP=$CI_LOOP
                 DISTRO=$DISTRO
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 OPENSTACK_VERSION=$OPENSTACK_VERSION
@@ -277,6 +293,10 @@
           name: DISTRO
           default: 'ubuntu1804'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
+      - string:
+          name: CI_LOOP
+          default: '{ci-loop}'
+          description: 'Type of the deployment'
       - string:
           name: DEPLOY_TYPE
           default: 'virtual'