Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
cloud-infra: Introduce CI_LOOP parameter
[infra/cicd.git]
/
jjb
/
cloud-infra
/
cloud-infra-periodic-openstack.yml
diff --git
a/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
b/jjb/cloud-infra/cloud-infra-periodic-openstack.yml
index 6b8822a9c57f5ddd57f1d9652626a41bebccfe5c..302afeeec4c8b3c7d2dbe597894fcadfda166e88 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-periodic-openstack.yml
+++ b/
jjb/cloud-infra/cloud-infra-periodic-openstack.yml
@@
-42,28
+42,47
@@
stream:
- 'master':
stream:
- 'master':
- branch: '{stream}'
+ disabled: 'true'
+ engine-branch: 'master'
+ openstack-branch: '{stream}'
+ - 'train':
+ disabled: 'true'
+ engine-branch: 'master'
+ openstack-branch: '{stream}'
+ - 'stein':
disabled: 'false'
disabled: 'false'
+ engine-branch: 'master'
+ openstack-branch: '{stream}'
+ - 'rocky':
+ disabled: 'true'
+ engine-branch: 'master'
+ openstack-branch: '{stream}'
distro:
distro:
- - ubuntu1804:
- disabled: 'false'
- - centos7:
- disabled: 'true'
+ - ubuntu1804
deploy-scenario:
- os-nosdn-nofeature
deploy-scenario:
- os-nosdn-nofeature
- ci-loop:
- - daily
-
type:
- baremetal:
pod-name: est-baremetal
type:
- baremetal:
pod-name: est-baremetal
+ slave-label: baremetal-deploy
provisioner-type: bifrost
installer-type: kolla
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'
yardstick-dispatcher: 'influxdb'
+ ci-loop: periodic
+ trigger-on: '0 */8 * * *'
phase:
- deploy:
phase:
- deploy:
@@
-91,12
+110,16
@@
parameters:
- project-parameters:
project: '{project}'
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'
- 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}'
- 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'
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}'
- string:
name: PROVISIONER_TYPE
default: '{provisioner-type}'
@@
-123,7
+150,7
@@
description: 'Scenario to deploy and test'
- string:
name: TEST_SUITE
description: 'Scenario to deploy and test'
- string:
name: TEST_SUITE
- default: '
smoke
'
+ default: '
{test-suite}
'
description: 'Test suite to run'
- string:
name: YARDSTICK_DISPATCHER
description: 'Test suite to run'
- string:
name: YARDSTICK_DISPATCHER
@@
-156,13
+183,13
@@
scm:
- git-scm:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
scm:
- git-scm:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
- branch: '{branch}'
+ branch: '{
engine-
branch}'
refspec: ''
wipe_workspace: true
clean_before: false
triggers:
refspec: ''
wipe_workspace: true
clean_before: false
triggers:
- - timed: '
@daily
'
+ - timed: '
{trigger-on}
'
builders:
- description-setter:
builders:
- description-setter:
@@
-174,9
+201,11
@@
- name: 'openstack-deploy-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
current-parameters: true
predefined-parameters: |
- 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
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
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@
-192,8
+221,10
@@
- name: 'openstack-functest-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
current-parameters: true
predefined-parameters: |
- 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
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
+ OPENSTACK_VERSION=$OPENSTACK_VERSION
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@
-210,8
+241,10
@@
- name: 'openstack-yardstick-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
current-parameters: true
predefined-parameters: |
- 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
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
+ OPENSTACK_VERSION=$OPENSTACK_VERSION
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@
-228,8
+261,10
@@
- name: 'openstack-promote-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
current-parameters: true
predefined-parameters: |
- 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
DISTRO=$DISTRO
DEPLOY_TYPE=$DEPLOY_TYPE
+ OPENSTACK_VERSION=$OPENSTACK_VERSION
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
PROVISIONER_TYPE=$PROVISIONER_TYPE
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
@@
-258,10
+293,18
@@
name: DISTRO
default: 'ubuntu1804'
description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
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: 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'
- string:
name: USE_PREBUILT_DEPLOYMENT_IMAGE
default: 'false'
@@
-310,7
+353,7
@@
scm:
- git-scm:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
scm:
- git-scm:
ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
- branch: '{branch}'
+ branch: '{
engine-
branch}'
refspec: ''
wipe_workspace: true
clean_before: false
refspec: ''
wipe_workspace: true
clean_before: false