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 "Parameterize DISTRIBUTION and merge job templates"
[infra/cicd.git]
/
jjb
/
metal3
/
job_capm3_v1b1_e2e_tests_centos.yml
diff --git
a/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
b/jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
index 603813f1d4273e31e7b44ba4d0949c60bbe562a0..97e8410bf2c21bbafb8c1062fb4ff211e1f1ea1f 100644
(file)
--- a/
jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
+++ b/
jjb/metal3/job_capm3_v1b1_e2e_tests_centos.yml
@@
-27,7
+27,7
@@
- job-template:
id: capm3_v1b1_e2e_tests_centos
name: '{job_prefix}_{name}_v1b1_e2e_test_centos'
- job-template:
id: capm3_v1b1_e2e_tests_centos
name: '{job_prefix}_{name}_v1b1_e2e_test_centos'
- description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS.
"
+ description: "CAPM3 v1beta1 e2e tests for {repo[org]}/{repo[name]} on CentOS."
project-type: pipeline
defaults: global
disabled: False
project-type: pipeline
defaults: global
disabled: False
@@
-56,7
+56,7
@@
- string:
name: DISTRIBUTION
default: 'centos'
- string:
name: DISTRIBUTION
default: 'centos'
- description: 'Distribution to use for the tests. Can be ubuntu or centos'
+ description: 'Distribution to use for the t
arget host and the t
ests. Can be ubuntu or centos'
- string:
name: CAPI_VERSION
default: 'v1beta1'
- string:
name: CAPI_VERSION
default: 'v1beta1'
@@
-65,10
+65,6
@@
name: CAPM3_VERSION
default: 'v1beta1'
description: 'Cluster API provider Metal3 version. Can be v1beta1.'
name: CAPM3_VERSION
default: 'v1beta1'
description: 'Cluster API provider Metal3 version. Can be v1beta1.'
- - string:
- name: TARGET_NODE_OS
- default: 'Centos'
- description: 'Distribution to use for the target host.'
- string:
name: TARGET_NODE_MEMORY
default: 4096
- string:
name: TARGET_NODE_MEMORY
default: 4096