X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;h=d54960bd4a7b78313da0c5d1a70bb801f8b3aa47;hb=e787e9a366b94baae77457179f7d00a85442eb0c;hp=e44605cabb16c9fb397be25cc1e710bc770e1412;hpb=139d039ffb1809c856e28d05408ab787698c3762;p=infra%2Fcicd.git

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index e44605ca..d54960bd 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -37,8 +37,8 @@
     - docker_image_building
     - update_nordix_repos
     - openstack_node_image_building
-    - main_openstack_ipa_and_ironic_image_building
-    - metal3_ipa_and_ironic_image_building_test
+    - main_fullstack_building
+    - fullstack_building_test
     - metal3_dev_tools_integration_test:
         image_os:
           - ubuntu
@@ -76,36 +76,44 @@
           repo: ironic-image
       - ironic_ipa_downloader:
           repo: ironic-ipa-downloader
+      - mariadb_image:
+          repo: mariadb-image
     image_os:
       - ubuntu
       - centos
-    version:
-      - v1b1:
+    capm3_target_branch:
+      - main:
           capi_version: v1beta1
           capm3_version: v1beta1
+          capm3_release_branch: main
           target_branches:
             - 'main'
-      - v1a5:
+      - release-1-2:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.2
+          target_branches:
+            - 'main'
+            - 'release-1.2'
+      - release-1-1:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.1
+          target_branches:
+            - 'main'
+            - 'release-1.1'
+      - release-0-5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
+          capm3_release_branch: release-0.5
           target_branches:
             - 'main'
             - 'release-0.5'
             - 'release-0.1'
-      - v1a4:
-          capi_version: v1alpha3
-          capm3_version: v1alpha4
-          target_branches:
-            - 'main'
-            - 'release-0.4'
-            - 'release-0.0'
     exclude:
       - proj: ironic_ipa_downloader
         image_os: centos
-        version: v1a5
-      - proj: ironic_ipa_downloader
-        image_os: centos
-        version: v1a4
+        capm3_target_branch: release-0-5
     jobs:
       - integration_tests
 
@@ -130,15 +138,31 @@
     image_os:
       - ubuntu
       - centos
-    version:
-      - v1b1:
+    capm3_target_branch:
+      - main:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: main
+          target_branches:
+            - 'main'
+      - release-1-2:
           capi_version: v1beta1
           capm3_version: v1beta1
+          capm3_release_branch: release-1.2
           target_branches:
             - 'main'
-      - v1a5:
+            - 'release-1.2'
+      - release-1-1:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.1
+          target_branches:
+            - 'main'
+            - 'release-1.1'
+      - release-0-5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
+          capm3_release_branch: release-0.5
           target_branches:
             - 'main'
             - 'release-0.5'
@@ -184,14 +208,26 @@
           exclude:
             - image_os: centos
       - capm3_main_integration_tests:
-          version:
-            - v1b1:
+          capm3_target_branch:
+            - main:
                 capi_version: v1beta1
                 capm3_version: v1beta1
+                capm3_release_branch: main
                 schedule: "H 4 * * *"
-            - v1a5:
+            - release-1-2:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.2
+                schedule: "30 4 * * *"
+            - release-1-1:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.1
+                schedule: "30 4 * * *"
+            - release-0-5:
                 capi_version: v1alpha4
                 capm3_version: v1alpha5
+                capm3_release_branch: release-0.5
                 schedule: "30 4 * * *"
 
 - project:
@@ -233,28 +269,44 @@
           ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
       - bmo:
           repo: baremetal-operator
+      - ipam:
+          repo: ip-address-manager
     image_os:
       - ubuntu
       - centos
-    version:
-      - v1b1:
+    capm3_target_branch:
+      - main:
           capi_version: v1beta1
           capm3_version: v1beta1
+          capm3_release_branch: main
           target_branches:
             - 'main'
-      - v1a5:
+      - release-1-2:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.2
+          target_branches:
+            - 'release-1.2'
+      - release-1-1:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.1
+          target_branches:
+            - 'release-1.1'
+      - release-0-5:
           capi_version: v1alpha4
           capm3_version: v1alpha5
+          capm3_release_branch: release-0.5
           target_branches:
             - 'release-0.5'
     jobs:
       - capm3_e2e_upgrade_tests:
           exclude:
             - image_os: centos
-            - version:
-              - v1b1
-              - v1a5
       - capm3_e2e_tests_parallel:
+          exclude:
+            - capm3_target_branch:
+              - release-0-5
       - capm3_e2e_tests:
       - keep_capm3_e2e_tests:
 
@@ -274,16 +326,30 @@
           exclude:
             - image_os: ubuntu
       - capm3_main_e2e_tests:
-          version:
-            - v1b1:
+          capm3_target_branch:
+            - main:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_branch: main
+                capm3_release_branch: main
                 schedule: "H 20 * * *"
-            - v1a5:
+            - release-1-2:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_branch: release-1.2
+                capm3_release_branch: release-1.2
+                schedule: "H 23 * * *"
+            - release-1-1:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_branch: release-1.1
+                capm3_release_branch: release-1.1
+                schedule: "H 23 * * *"
+            - release-0-5:
                 capi_version: v1alpha4
                 capm3_version: v1alpha5
                 capm3_branch: release-0.5
+                capm3_release_branch: release-0.5
                 schedule: "H 23 * * *"