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
Enable scenario input for engine verify jobs
[infra/cicd.git]
/
jjb
/
cloud-infra
/
cloud-infra-verify-engine.yaml
diff --git
a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 61a6eacc4924a700f2f02ee770fd30fe535bf574..25e55dd324be0fe45e9ec6756e397cdd828deab9 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/
jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@
-119,10
+119,6
@@
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: DEPLOY_SCENARIO
- default: 'k8-calico-nofeature'
- description: 'Scenario to deploy and test'
- string:
name: TEST_SUITE
default: 'healthcheck'
- string:
name: TEST_SUITE
default: 'healthcheck'
@@
-166,6
+162,7
@@
files: '**'
builders:
files: '**'
builders:
+ - 'cloud-infra-determine-scenario-macro'
- multijob:
name: deploy
condition: SUCCESSFUL
- multijob:
name: deploy
condition: SUCCESSFUL
@@
-179,7
+176,6
@@
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
- DEPLOY_SCENARIO=$DEPLOY_SCENARIO
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
GERRIT_BRANCH=$GERRIT_BRANCH
@@
-202,7
+198,6
@@
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
- DEPLOY_SCENARIO=$DEPLOY_SCENARIO
TEST_SUITE=$TEST_SUITE
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
TEST_SUITE=$TEST_SUITE
CLEANUP=$CLEANUP
GERRIT_PROJECT=$GERRIT_PROJECT
@@
-252,10
+247,6
@@
name: DIB_OS_ELEMENT
default: 'ubuntu-minimal'
description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
name: DIB_OS_ELEMENT
default: 'ubuntu-minimal'
description: 'DIB OS Element to use for building the deployment image to provision target nodes with. Overriden by upstream job.'
- - string:
- name: DEPLOY_SCENARIO
- default: 'k8-calico-nofeature'
- description: 'Scenario to deploy and test'
- string:
name: TEST_FW
default: '{phase}'
- string:
name: TEST_FW
default: '{phase}'
@@
-284,6
+275,7
@@
refspec: $GERRIT_REFSPEC
builders:
refspec: $GERRIT_REFSPEC
builders:
+ - 'cloud-infra-determine-scenario-macro'
- 'cloud-infra-{phase}-macro'
# vim: set ts=2 sw=2 expandtab:
- 'cloud-infra-{phase}-macro'
# vim: set ts=2 sw=2 expandtab: