Metal3: Replace CAPM3 API version with branch names in all jobs trigger phrases

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

diff --git a/jjb/metal3/job_capm3_e2e_tests.yml b/jjb/metal3/job_capm3_e2e_tests.yml
index bcc55421eaafdb57184e087ac63fe8a4b5caffa2..d1372f3e725568643456372caa9a12c0b290f1db 100644 (file)
--- a/jjb/metal3/job_capm3_e2e_tests.yml
+++ b/jjb/metal3/job_capm3_e2e_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_e2e_tests
-    name: '{job_prefix}_{proj}_{version}_e2e_test_{image_os}'
+    name: '{job_prefix}_{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
@@ -90,7 +90,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(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-e2e-{capm3_target_branch}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -98,7 +98,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"
+        status-context: "test-{image_os}-e2e-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"