remove Infra Engine jobs

[infra/cicd.git] / jjb / metal3 / job_capm3_e2e_tests_parallel.yml

diff --git a/jjb/metal3/job_capm3_e2e_tests_parallel.yml b/jjb/metal3/job_capm3_e2e_tests_parallel.yml
index 1bc0df9ec3628b5541697b61585a743b56f9143f..2a41d05cce5c565cb4226c3c143819d72e460931 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_tests_parallel.yml
+++ b/jjb/metal3/job_capm3_e2e_tests_parallel.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_e2e_tests_parallel
-    name: '{job_prefix}_{proj}_{version}_e2e_test_{image_os}_parallel'
+    name: '{job_prefix}_{proj}_{capm3_target_branch}_e2e_test_{image_os}_parallel'
     description: "CAPM3 {capm3_version} e2e tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
@@ -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'
+    - 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}'
@@ -90,7 +94,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{version}-{image_os}-e2e-parallel(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-parallel-{capm3_target_branch}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -98,7 +102,7 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches: "{target_branches}"
-        status-context: "test-{version}-{image_os}-e2e-parallel"
+        status-context: "test-{image_os}-e2e-parallel-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"