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 "Airship: finalize update for CAPM3 v1a4 release"
[infra/cicd.git]
/
jjb
/
airship
/
job_capi_bm_v1a4_integration_tests_ubuntu.yml
diff --git
a/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
b/jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
index dc4d19b3cd9923def9e2fa1398f9b752683b27c7..d8fbb9b336d5bcf4dd7397d9c402736209b8c1ef 100644
(file)
--- a/
jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
+++ b/
jjb/airship/job_capi_bm_v1a4_integration_tests_ubuntu.yml
@@
-59,8
+59,12
@@
description: 'Distribution to use for the tests. Can be ubuntu or centos'
- string:
name: CAPI_VERSION
description: 'Distribution to use for the tests. Can be ubuntu or centos'
- string:
name: CAPI_VERSION
+ default: 'v1alpha3'
+ description: 'Cluster API version. Can be v1alpha3.'
+ - string:
+ name: CAPM3_VERSION
default: 'v1alpha4'
default: 'v1alpha4'
- description: 'Cluster API
version. Can be v1alpha1,v1alpha2,
v1alpha3 or v1alpha4.'
+ description: 'Cluster API
provider Metal3 version. Can be
v1alpha3 or v1alpha4.'
- string:
name: TARGET_NODE_OS
default: 'Ubuntu'
- string:
name: TARGET_NODE_OS
default: 'Ubuntu'
@@
-92,7
+96,7
@@
github-hooks: True
permit-all: False
auto-close-on-fail: False
github-hooks: True
permit-all: False
auto-close-on-fail: False
- allow-whitelist-orgs-as-admins:
Fals
e
+ allow-whitelist-orgs-as-admins:
Tru
e
white-list-target-branches:
- 'master'
- 'release-0.3'
white-list-target-branches:
- 'master'
- 'release-0.3'