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
Update sdc-sdc-be-common-verify to java 11
[infra/cicd.git]
/
jjb
/
metal3
/
job_keep_capm3_e2e_tests.yml
diff --git
a/jjb/metal3/job_keep_capm3_e2e_tests.yml
b/jjb/metal3/job_keep_capm3_e2e_tests.yml
index 185f8d9387ad9a542759dc208551fcc9304c203d..5a55058a1c65592da74abf88ac211a285b84161c 100644
(file)
--- a/
jjb/metal3/job_keep_capm3_e2e_tests.yml
+++ b/
jjb/metal3/job_keep_capm3_e2e_tests.yml
@@
-26,8
+26,8
@@
- job-template:
id: keep_capm3_e2e_tests
- job-template:
id: keep_capm3_e2e_tests
- name: '{job_prefix}_keep_{
name}_{version
}_e2e_test_{image_os}'
- description: "CAPM3 {capm3_version} e2e tests for {
repo[org]}/{repo[name]
} on {image_os}."
+ name: '{job_prefix}_keep_{
proj}_{capm3_target_branch
}_e2e_test_{image_os}'
+ description: "CAPM3 {capm3_version} e2e tests for {
org}/{repo
} on {image_os}."
project-type: pipeline
defaults: global
disabled: False
project-type: pipeline
defaults: global
disabled: False
@@
-35,11
+35,11
@@
parameters:
- string:
name: PROJECT_REPO_ORG
parameters:
- string:
name: PROJECT_REPO_ORG
- default: '{
repo[org]
}'
+ default: '{
org
}'
description: 'Project github repo org name'
- string:
name: PROJECT_REPO_NAME
description: 'Project github repo org name'
- string:
name: PROJECT_REPO_NAME
- default: '{repo
[name]
}'
+ default: '{repo}'
description: 'Project github repo name'
- string:
name: ghprbActualCommit
description: 'Project github repo name'
- string:
name: ghprbActualCommit
@@
-47,7
+47,7
@@
description: 'CI Repo branch for triggering manual build'
- string:
name: ghprbAuthorRepoGitUrl
description: 'CI Repo branch for triggering manual build'
- string:
name: ghprbAuthorRepoGitUrl
- default: 'https://github.com/{
repo[org]}/{repo[name]
}.git'
+ default: 'https://github.com/{
org}/{repo
}.git'
description: 'CI Repo URL for triggering manual build'
- string:
name: ghprbTargetBranch
description: 'CI Repo URL for triggering manual build'
- string:
name: ghprbTargetBranch
@@
-57,6
+57,10
@@
name: IMAGE_OS
default: '{image_os}'
description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
name: IMAGE_OS
default: '{image_os}'
description: 'Distribution to use for the target host as well as source and target cluster. Can be ubuntu or centos'
+ - string:
+ name: capm3_release_branch
+ default: '{capm3_release_branch}'
+ description: 'The target branch of CAPM3 to be used for this test'
- string:
name: CAPI_VERSION
default: '{capi_version}'
- string:
name: CAPI_VERSION
default: '{capi_version}'
@@
-85,7
+89,7
@@
artifact-days-to-keep: -1
artifact-num-to-keep: -1
- github:
artifact-days-to-keep: -1
artifact-num-to-keep: -1
- github:
- url: https://github.com/{
repo[org]}/{repo[name]
}
+ url: https://github.com/{
org}/{repo
}
triggers:
- github-pull-request:
triggers:
- github-pull-request:
@@
-94,7
+98,7
@@
org-list: "{ci_github_whitelist_org}"
cron: 'H/5 * * * *'
auth-id: "{ci_ghprb_auth_id}"
org-list: "{ci_github_whitelist_org}"
cron: 'H/5 * * * *'
auth-id: "{ci_ghprb_auth_id}"
- trigger-phrase: '((.|\n)*\s)?/keep-test-{
version}-{image_os}-e2e
(\s(.|\n)*)?'
+ trigger-phrase: '((.|\n)*\s)?/keep-test-{
image_os}-e2e-{capm3_target_branch}
(\s(.|\n)*)?'
skip-build-phrase: '/skip-test'
only-trigger-phrase: True
github-hooks: True
skip-build-phrase: '/skip-test'
only-trigger-phrase: True
github-hooks: True
@@
-102,7
+106,7
@@
auto-close-on-fail: False
allow-whitelist-orgs-as-admins: True
white-list-target-branches: "{target_branches}"
auto-close-on-fail: False
allow-whitelist-orgs-as-admins: True
white-list-target-branches: "{target_branches}"
- status-context: "keep-test-{
version}-{image_os}-e2e
"
+ status-context: "keep-test-{
image_os}-e2e-{capm3_target_branch}
"
success-status: "Passed"
failure-status: "Failed"
error-status: "Error"
success-status: "Passed"
failure-status: "Failed"
error-status: "Error"