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

Change-Id: Ifb9d04095e825f3c5b06b9040d116b05ea2cf89b

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"

diff --git a/jjb/metal3/job_capm3_e2e_tests_parallel.yml b/jjb/metal3/job_capm3_e2e_tests_parallel.yml
index 1bc0df9ec3628b5541697b61585a743b56f9143f..5fec0e6c80c8d9ac80652026e56354060ce15c1e 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
@@ -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-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 +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-parallel"
+        status-context: "test-{image_os}-e2e-parallel-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"

diff --git a/jjb/metal3/job_capm3_main_e2e_tests.yml b/jjb/metal3/job_capm3_main_e2e_tests.yml
index 255e95c7f3d7773894d16a6af8fcc21ded71fa03..4dea33c677b60ddf67778c1e59e763fe015b3eff 100644 (file)
--- a/jjb/metal3/job_capm3_main_e2e_tests.yml
+++ b/jjb/metal3/job_capm3_main_e2e_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_main_e2e_tests
-    name: '{job_prefix}_main_{version}_e2e_test_{image_os}'
+    name: '{job_prefix}_main_{capm3_target_branch}_e2e_test_{image_os}'
     description: "CAPM3 {capm3_version} e2e tests for {repo[org]}/{repo[name]} on {image_os}."
     project-type: pipeline
     defaults: global

diff --git a/jjb/metal3/job_capm3_main_integration_tests.yml b/jjb/metal3/job_capm3_main_integration_tests.yml
index 19d8b5277a29cefb6075d099aa4471a7abb3cf57..7827fb6bbccf69839c5ddb91b226cbea49181626 100644 (file)
--- a/jjb/metal3/job_capm3_main_integration_tests.yml
+++ b/jjb/metal3/job_capm3_main_integration_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: capm3_main_integration_tests
-    name: '{job_prefix}_main_{version}_integration_test_{image_os}'
+    name: '{job_prefix}_main_{capm3_target_branch}_integration_test_{image_os}'
     description: "CAPM3 {capm3_version} integration tests for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global

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"

diff --git a/jjb/metal3/job_keep_capm3_e2e_tests.yml b/jjb/metal3/job_keep_capm3_e2e_tests.yml
index 4f01ed433d28cb9618213426d7052affd423767a..ba347fca31659d406f3f0dfaff599a7d06362fed 100644 (file)
--- a/jjb/metal3/job_keep_capm3_e2e_tests.yml
+++ b/jjb/metal3/job_keep_capm3_e2e_tests.yml
@@ -26,7 +26,7 @@
 
 - job-template:
     id: keep_capm3_e2e_tests
-    name: '{job_prefix}_keep_{proj}_{version}_e2e_test_{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
@@ -94,7 +94,7 @@
         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
@@ -102,7 +102,7 @@
         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"

diff --git a/jjb/metal3/job_keep_integration_vm.yml b/jjb/metal3/job_keep_integration_vm.yml
index 6886dc34d25c9f726be2bc0f898024d5e50a5a11..49b6712896fb7ff4d2ee1080e14bc294682d63f0 100644 (file)
--- a/jjb/metal3/job_keep_integration_vm.yml
+++ b/jjb/metal3/job_keep_integration_vm.yml
@@ -27,7 +27,7 @@
 
 - job-template:
     id: keep_integration_tests
-    name: '{job_prefix}_{proj}_keep_{version}_test_{image_os}_alive'
+    name: '{job_prefix}_{proj}_keep_{capm3_target_branch}_test_{image_os}_alive'
     description: "CAPM3 {capm3_version} integration tests for keeping the vm for {org}/{repo} on {image_os}."
     project-type: pipeline
     defaults: global
@@ -91,7 +91,7 @@
         org-list: "{ci_github_whitelist_org}"
         cron: 'H/5 * * * *'
         auth-id: "{ci_ghprb_auth_id}"
-        trigger-phrase: '((.|\n)*\s)?/keep-test-{version}-{image_os}-integration(\s(.|\n)*)?'
+        trigger-phrase: '((.|\n)*\s)?/keep-test-{image_os}-integration-{capm3_target_branch}(\s(.|\n)*)?'
         skip-build-phrase: '/skip-test'
         only-trigger-phrase: True
         github-hooks: True
@@ -99,7 +99,7 @@
         auto-close-on-fail: False
         allow-whitelist-orgs-as-admins: True
         white-list-target-branches: "{target_branches}"
-        status-context: "keep-test-{version}-{image_os}-integration"
+        status-context: "keep-test-{image_os}-integration-{capm3_target_branch}"
         success-status: "Passed"
         failure-status: "Failed"
         error-status: "Error"

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 8157ce3a46e159e29a42688432ef01432e997229..0859eab49f5c0dfb77b594e0c7fe53d45ec61945 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -79,13 +79,13 @@
     image_os:
       - ubuntu
       - centos
-    version:
-      - v1b1:
+    capm3_target_branch:
+      - main:
           capi_version: v1beta1
           capm3_version: v1beta1
           target_branches:
             - 'main'
-      - v1a5:
+      - release-0-5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
           target_branches:
@@ -95,7 +95,7 @@
     exclude:
       - proj: ironic_ipa_downloader
         image_os: centos
-        version: v1a5
+        capm3_target_branch: release-0-5
     jobs:
       - integration_tests
 
@@ -120,13 +120,13 @@
     image_os:
       - ubuntu
       - centos
-    version:
-      - v1b1:
+    capm3_target_branch:
+      - main:
           capi_version: v1beta1
           capm3_version: v1beta1
           target_branches:
             - 'main'
-      - v1a5:
+      - release-0-5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
           target_branches:
@@ -174,12 +174,12 @@
           exclude:
             - image_os: centos
       - capm3_main_integration_tests:
-          version:
-            - v1b1:
+          capm3_target_branch:
+            - main:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 schedule: "H 4 * * *"
-            - v1a5:
+            - release-0-5:
                 capi_version: v1alpha4
                 capm3_version: v1alpha5
                 schedule: "30 4 * * *"
@@ -226,13 +226,13 @@
     image_os:
       - ubuntu
       - centos
-    version:
-      - v1b1:
+    capm3_target_branch:
+      - main:
           capi_version: v1beta1
           capm3_version: v1beta1
           target_branches:
             - 'main'
-      - v1a5:
+      - release-0-5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
           target_branches:
@@ -241,13 +241,13 @@
       - capm3_e2e_upgrade_tests:
           exclude:
             - image_os: centos
-            - version:
-              - v1b1
-              - v1a5
+            - capm3_target_branch:
+              - main
+              - release-0-5
       - capm3_e2e_tests_parallel:
           exclude:
-            - version:
-              - v1a5
+            - capm3_target_branch:
+              - release-0-5
       - capm3_e2e_tests:
       - keep_capm3_e2e_tests:
 
@@ -267,13 +267,13 @@
           exclude:
             - image_os: ubuntu
       - capm3_main_e2e_tests:
-          version:
-            - v1b1:
+          capm3_target_branch:
+            - main:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_branch: main
                 schedule: "H 20 * * *"
-            - v1a5:
+            - release-0-5:
                 capi_version: v1alpha4
                 capm3_version: v1alpha5
                 capm3_branch: release-0.5