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
Fix downstream jobs for scenario periodic jobs
[infra/cicd.git]
/
jjb
/
cloud-infra
/
cloud-infra-periodic-engine.yaml
diff --git
a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 8bddd1fa51a62b97ed58e3c7ebbaba0ff7a36ffe..6fbdd92c361e5afbc7b68805521ea6cb083d0463 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/
jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@
-63,9
+63,11
@@
- virtual:
slave-label: 'vpod-deploy-city'
yardstick-dispatcher: 'file'
- virtual:
slave-label: 'vpod-deploy-city'
yardstick-dispatcher: 'file'
+ build-trigger: 'H H/3 * * *'
- baremetal:
slave-label: 'baremetal-deploy'
yardstick-dispatcher: 'influxdb'
- baremetal:
slave-label: 'baremetal-deploy'
yardstick-dispatcher: 'influxdb'
+ build-trigger: '@daily'
phase:
- deploy:
phase:
- deploy:
@@
-121,6
+123,10
@@
name: DIB_OS_ELEMENT
default: '{dib_os_element}'
description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
name: DIB_OS_ELEMENT
default: '{dib_os_element}'
description: 'DIB OS Element to use for building the deployment image to provision target nodes with'
+ - string:
+ name: INSTALLER_TYPE
+ default: 'kubespray'
+ description: 'Installer to use for deploying the scenario'
- string:
name: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'
- string:
name: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'
@@
-166,7
+172,7
@@
refspec: ''
triggers:
refspec: ''
triggers:
- - timed: '
H H/3 * * *
'
+ - timed: '
{build-trigger}
'
builders:
- multijob:
builders:
- multijob:
@@
-182,6
+188,7
@@
IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
DIB_OS_RELEASE=$DIB_OS_RELEASE
DIB_OS_ELEMENT=$DIB_OS_ELEMENT
IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
DIB_OS_RELEASE=$DIB_OS_RELEASE
DIB_OS_ELEMENT=$DIB_OS_ELEMENT
+ INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
CLEANUP=$CLEANUP
git-revision: true
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
CLEANUP=$CLEANUP
git-revision: true
@@
-197,8
+204,10
@@
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
DEPLOY_TYPE=$DEPLOY_TYPE
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
DEPLOY_TYPE=$DEPLOY_TYPE
+ INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
+ YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
CLEANUP=$CLEANUP
node-parameters: true
kill-phase-on: NEVER
CLEANUP=$CLEANUP
node-parameters: true
kill-phase-on: NEVER
@@
-212,6
+221,7
@@
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
DEPLOY_TYPE=$DEPLOY_TYPE
predefined-parameters: |
DISTRIBUTION=$DISTRIBUTION
DEPLOY_TYPE=$DEPLOY_TYPE
+ INSTALLER_TYPE=$INSTALLER_TYPE
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
@@
-262,6
+272,10
@@
name: ENGINE_ANSIBLE_PARAMS
default: ' -v '
description: 'Extra paramters that can be added when run the play books.'
name: ENGINE_ANSIBLE_PARAMS
default: ' -v '
description: 'Extra paramters that can be added when run the play books.'
+ - string:
+ name: INSTALLER_TYPE
+ default: 'kubespray'
+ description: 'Installer to use for deploying the scenario'
- string:
name: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'
- string:
name: DEPLOY_SCENARIO
default: 'k8-calico-nofeature'