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 "Add main branch reference for project infra"
[infra/cicd.git]
/
jjb
/
airship
/
job_master_feature_tests_upgrade_ubuntu.yml
diff --git
a/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
b/jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
index 0a777b0392c45c3d232b0c31a2e5f1789e7b0d38..8cb5e0ebd49cfbcfbfb4203c7493d36b65164cc7 100644
(file)
--- a/
jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
+++ b/
jjb/airship/job_master_feature_tests_upgrade_ubuntu.yml
@@
-59,12
+59,12
@@
description: 'Distribution to use for the tests.'
- string:
name: CAPI_VERSION
description: 'Distribution to use for the tests.'
- string:
name: CAPI_VERSION
- default: 'v1
alpha3
'
- description: 'Cluster API version.
Can be v1alpha3.
'
+ default: 'v1
beta1
'
+ description: 'Cluster API version.'
- string:
name: CAPM3_VERSION
- string:
name: CAPM3_VERSION
- default: 'v1
alpha4
'
- description: 'Cluster API provider Metal3 version.
Can be v1alpha4.
'
+ default: 'v1
beta1
'
+ description: 'Cluster API provider Metal3 version.'
- string:
name: TARGET_NODE_OS
default: 'Ubuntu'
- string:
name: TARGET_NODE_OS
default: 'Ubuntu'
@@
-81,6
+81,10
@@
name: TESTS_FOR
default: "feature_tests_upgrade"
description: 'Tests for upgrade.'
name: TESTS_FOR
default: "feature_tests_upgrade"
description: 'Tests for upgrade.'
+ - string:
+ name: PROMETHEUS_MONITORING
+ default: "true"
+ description: 'Enable Prometheus metrics'
properties:
- build-discarder:
properties:
- build-discarder:
@@
-90,7
+94,7
@@
artifact-num-to-keep: -1
triggers:
artifact-num-to-keep: -1
triggers:
- - timed: "H
H(21-23)
* * *"
+ - timed: "H
17
* * *"
pipeline-scm:
scm:
pipeline-scm:
scm:
@@
-98,7
+102,7
@@
url: "{ci_github_repo}"
credentials-id: "{ci_github_jenkins_credentials_id}"
branches:
url: "{ci_github_repo}"
credentials-id: "{ci_github_jenkins_credentials_id}"
branches:
- - '{branch|ma
ster
}'
+ - '{branch|ma
in
}'
name: 'origin'
refspec: '+refs/heads/*:refs/remotes/origin/*'
wipe-workspace: True
name: 'origin'
refspec: '+refs/heads/*:refs/remotes/origin/*'
wipe-workspace: True