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
Merge changes from topic 'cloud-infra-jjb'
[infra/cicd.git]
/
jjb
/
cloud-infra
/
cloud-infra-periodic-scenario.yaml
diff --git
a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index a5e66f27ea5cb16e6799814c72a348659237ff8f..0e8d3f034bb8d552a0e21ab5b386965c3a1540ab 100644
(file)
--- 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'
- centos7:
disabled: 'true'
+ ci-loop:
+ - daily
+
deploy-scenario:
- k8-calico-nofeature:
installer-type: kubespray
deploy-scenario:
- k8-calico-nofeature:
installer-type: kubespray
@@
-71,6
+74,7
@@
- baremetal:
slave-label: 'baremetal-deploy'
yardstick-dispatcher: 'influxdb'
- baremetal:
slave-label: 'baremetal-deploy'
yardstick-dispatcher: 'influxdb'
+ provisioner-type: 'bifrost'
phase:
- deploy:
phase:
- deploy:
@@
-83,11
+87,11
@@
build-timeout: 5
jobs:
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:
- job-template:
- name: '{deploy-scenario}-
periodic-{distro}-{type
}-{stream}'
+ name: '{deploy-scenario}-
{distro}-{installer-type}-{type}-{ci-loop
}-{stream}'
project-type: multijob
project-type: multijob
@@
-116,6
+120,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: PROVISIONER_TYPE
+ default: '{provisioner-type}'
+ description: 'Provisioner to use for provisioning nodes'
- string:
name: INSTALLER_TYPE
default: '{installer-type}'
- string:
name: INSTALLER_TYPE
default: '{installer-type}'
@@
-169,17
+177,18
@@
builders:
- description-setter:
builders:
- description-setter:
- description: $
INSTALLER_TYPE
+ description: $
PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
- multijob:
name: deploy
condition: SUCCESSFUL
projects:
- 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
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
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
CLEANUP=$CLEANUP
@@
-191,11
+200,12
@@
name: functest
condition: SUCCESSFUL
projects:
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
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
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
@@
-208,11
+218,12
@@
name: yardstick
condition: SUCCESSFUL
projects:
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
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
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
@@
-225,11
+236,12
@@
name: promote
condition: SUCCESSFUL
projects:
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
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
INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
@@
-240,7
+252,7
@@
abort-all-job: true
- job-template:
abort-all-job: true
- job-template:
- name: 'scenario-
periodic-{distro}-{phase}-{type
}-{stream}'
+ name: 'scenario-
{distro}-{phase}-{type}-{ci-loop
}-{stream}'
disabled: false
disabled: false
@@
-273,6
+285,10
@@
name: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'
description: 'Scenario to deploy and test'
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'
- string:
name: INSTALLER_TYPE
default: 'kubespray'
@@
-312,7
+328,7
@@
builders:
- description-setter:
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:
- 'scenario-{phase}-macro'
# vim: set ts=2 sw=2 expandtab: