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_keep_integration_vm_v1a5_centos.yml
diff --git
a/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
b/jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
index 8e48a4535faa857fbe8423a743539bf1d9badd16..6856c4555838218209d358bf1ff47d1e3e1c0b90 100644
(file)
--- a/
jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
+++ b/
jjb/metal3/job_keep_integration_vm_v1a5_centos.yml
@@
-28,7
+28,7
@@
- job-template:
id: keep_v1a5_test_centos_alive
name: '{job_prefix}_{name}_keep_v1a5_test_centos_alive'
- job-template:
id: keep_v1a5_test_centos_alive
name: '{job_prefix}_{name}_keep_v1a5_test_centos_alive'
- description: "CAPM3 v1alpha5 integration tests for keeping the vm for {repo[org]}/{repo[name]} on CentOS.
"
+ description: "CAPM3 v1alpha5 integration tests for keeping the vm for {repo[org]}/{repo[name]} on CentOS."
project-type: pipeline
defaults: global
disabled: False
project-type: pipeline
defaults: global
disabled: False
@@
-57,7
+57,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: 'v1alpha4'
- string:
name: CAPI_VERSION
default: 'v1alpha4'
@@
-66,10
+66,6
@@
name: CAPM3_VERSION
default: 'v1alpha5'
description: 'Cluster API provider Metal3 version.'
name: CAPM3_VERSION
default: 'v1alpha5'
description: 'Cluster API provider Metal3 version.'
- - 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