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

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

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