Create release specific periodic OpenStack jobs
Current jobs are named as master which does not reflect the version
of OpenStack which gets deployed and tested by CI. This change creates
new jobs named after a specific release. Only stein jobs are enabled
at the moment.
Change-Id: Ib1f255d9f932f244c61fff6de040036dcc7b424e
diff --git a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
index 6b8822a..93fe54d 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
+++ b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
@@ -42,14 +42,25 @@
stream:
- 'master':
- branch: '{stream}'
+ disabled: 'true'
+ engine-branch: 'master'
+ openstack-branch: '{stream}'
+ - 'train':
+ disabled: 'true'
+ engine-branch: 'master'
+ openstack-branch: '{stream}'
+ - 'stein':
disabled: 'false'
+ engine-branch: 'master'
+ openstack-branch: '{stream}'
+ - 'rocky':
+ disabled: 'true'
+ engine-branch: 'master'
+ openstack-branch: '{stream}'
distro:
- ubuntu1804:
disabled: 'false'
- - centos7:
- disabled: 'true'
deploy-scenario:
- os-nosdn-nofeature
@@ -91,7 +102,7 @@
parameters:
- project-parameters:
project: '{project}'
- branch: '{branch}'
+ branch: '{engine-branch}'
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
@@ -110,6 +121,10 @@
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}'
description: 'Provisioner to use for provisioning nodes'
@@ -156,7 +171,7 @@
scm:
- git-scm:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
- branch: '{branch}'
+ branch: '{engine-branch}'
refspec: ''
wipe_workspace: true
clean_before: false
@@ -177,6 +192,7 @@
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
@@ -194,6 +210,7 @@
predefined-parameters: |
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
+ OPENSTACK_VERSION=$OPENSTACK_VERSION
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -212,6 +229,7 @@
predefined-parameters: |
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
+ OPENSTACK_VERSION=$OPENSTACK_VERSION
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -230,6 +248,7 @@
predefined-parameters: |
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
+ OPENSTACK_VERSION=$OPENSTACK_VERSION
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@ -263,6 +282,10 @@
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'
description: 'Use prebuilt deployment image while running as part of CI/CD'
@@ -310,7 +333,7 @@
scm:
- git-scm:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
- branch: '{branch}'
+ branch: '{engine-branch}'
refspec: ''
wipe_workspace: true
clean_before: false