X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-openstack.yml;h=e0cb0dd9af9201710918e84cdbc282ad4f9a2b12;hb=80ba4e8007d26f5bd719b3c56ee521be3d790666;hp=6b8822a9c57f5ddd57f1d9652626a41bebccfe5c;hpb=65ea64902fd74ba73df6068b1b6281fc019d4b12;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
index 6b8822a9..e0cb0dd9 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
+++ b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
@@ -42,28 +42,47 @@
 
     stream:
       - 'master':
-          branch: '{stream}'
-          disabled: 'false'
+          disabled: 'true'
+          engine-branch: 'master'
+          openstack-branch: '{stream}'
+      - 'train':
+          disabled: 'true'
+          engine-branch: 'master'
+          openstack-branch: '{stream}'
+      - 'stein':
+          disabled: 'true'
+          engine-branch: 'master'
+          openstack-branch: '{stream}'
+      - 'rocky':
+          disabled: 'true'
+          engine-branch: 'master'
+          openstack-branch: '{stream}'
 
     distro:
-      - ubuntu1804:
-          disabled: 'false'
-      - centos7:
-          disabled: 'true'
+      - 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:
@@ -91,12 +110,16 @@
     parameters:
       - project-parameters:
           project: '{project}'
-          branch: '{branch}'
+          branch: '{engine-branch}'
       - nordix-gerrit-parameters
       - label:
           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}'
@@ -109,6 +132,10 @@
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
           description: 'Use prebuilt deployment image while running as part of CI/CD'
+      - string:
+          name: OPENSTACK_VERSION
+          default: '{openstack-branch}'
+          description: 'OpenStack Version to deploy and test'
       - string:
           name: PROVISIONER_TYPE
           default: '{provisioner-type}'
@@ -123,25 +150,25 @@
           description: 'Scenario to deploy and test'
       - string:
           name: TEST_SUITE
-          default: 'smoke'
+          default: '{test-suite}'
           description: 'Test suite to run'
       - string:
           name: YARDSTICK_DISPATCHER
           default: '{yardstick-dispatcher}'
           description: 'Dispatcher to use for Yardstick reporting'
-      - string:
-          name: CLEANUP
-          default: 'true'
-          description: 'Cleanup leftovers of the previous run'
 
     properties:
       - logrotate
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
             - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -156,13 +183,13 @@
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
-          branch: '{branch}'
+          branch: '{engine-branch}'
           refspec: ''
           wipe_workspace: true
           clean_before: false
 
     triggers:
-      - timed: '@daily'
+      - timed: '{trigger-on}'
 
     builders:
       - description-setter:
@@ -174,13 +201,14 @@
             - 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
+                OPENSTACK_VERSION=$OPENSTACK_VERSION
                 PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                CLEANUP=$CLEANUP
               git-revision: true
               node-parameters: true
               kill-phase-on: FAILURE
@@ -192,14 +220,15 @@
             - 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
                 PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -210,14 +239,15 @@
             - 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
                 PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -228,14 +258,15 @@
             - 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
                 PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
@@ -258,10 +289,18 @@
           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'
           description: 'Type of the deployment. Overriden by upstream job.'
+      - string:
+          name: OPENSTACK_VERSION
+          default: 'stein'
+          description: 'OpenStack Version to deploy and test'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'false'
@@ -298,9 +337,6 @@
           name: YARDSTICK_DISPATCHER
           default: 'file'
           description: 'Dispatcher to use for Yardstick reporting'
-      - string:
-          name: CLEANUP
-          default: 'false'
 
     wrappers:
       - build-timeout:
@@ -310,7 +346,7 @@
     scm:
       - git-scm:
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
-          branch: '{branch}'
+          branch: '{engine-branch}'
           refspec: ''
           wipe_workspace: true
           clean_before: false