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

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

diff --git a/jjb/metal3/job_integration_tests.yml b/jjb/metal3/job_integration_tests.yml
index e521497c270be121a8ab3e1acffdba34e213a1ab..02a782b40a4772e35708c7f424e526e897c27779 100644 (file)
--- a/jjb/metal3/job_integration_tests.yml
+++ b/jjb/metal3/job_integration_tests.yml
@@ -25,7 +25,7 @@
 # pipeline job. The pipeline scripts are maintained in Metal3 CI project infra repository.
 
 - job-template:
-    name: '{job_prefix}_{proj}_{version}_integration_test_{image_os}{name_postfix}'
+    name: '{job_prefix}_{proj}_{capm3_target_branch}_integration_test_{image_os}{name_postfix}'
     description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os} with ironic installed from {ironic_install_type}."
     id: 'integration_tests'
     project-type: pipeline
@@ -89,7 +89,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/test-{version}-{image_os}-integration{trigger_postfix}(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/test-{image_os}-integration-{capm3_target_branch}{trigger_postfix}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -97,7 +97,7 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches: "{target_branches}"
-        status-context: "test-{version}-{image_os}-integration"
+        status-context: "test-{image_os}-integration-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"