X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;h=723fdbbf0075d2ca0236dea5195df219c0cda85e;hb=886a604d692efb0da63824ab20e0f49fc8399f2b;hp=2ba404079e3f43f5617b9155b93ac10e25ba7389;hpb=146f50a3252eb3334f04d5031d7dd26f9082a976;p=infra%2Fcicd.git

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 2ba40407..723fdbbf 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -37,13 +37,13 @@
     - 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
           - centos
-    - artifactory_cleanup
+    - artifact_cleanup
     repo:
       org: "Nordix"
       name: "metal3-dev-tools"
@@ -67,43 +67,50 @@
           repo: baremetal-operator
       - ipam:
           repo: ip-address-manager
+      - ironic_image:
+          repo: ironic-image
+          name_postfix: '_ironic_from_source'
+          trigger_postfix: '-ironic-source'
+          ironic_install_type: 'source'
       - ironic_image:
           repo: ironic-image
       - ironic_ipa_downloader:
           repo: ironic-ipa-downloader
+      - mariadb_image:
+          repo: mariadb-image
+          build_mariadb_image_locally: 'true'
+          ironic_use_mariadb: 'true'
     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-4:
           capi_version: v1beta1
           capm3_version: v1beta1
+          capm3_release_branch: release-1.4
           target_branches:
-            - 'master'
             - 'main'
-      - v1a5:
-          capi_version: v1alpha4
-          capm3_version: v1alpha5
+            - 'release-1.4'
+      - release-1-3:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.3
           target_branches:
-            - 'master'
             - 'main'
-            - 'release-0.5'
-            - 'release-0.1'
-      - v1a4:
-          capi_version: v1alpha3
-          capm3_version: v1alpha4
+            - 'release-1.3'
+      - release-1-2:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.2
           target_branches:
-            - 'master'
             - '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
+            - 'release-1.2'
     jobs:
       - integration_tests
 
@@ -128,49 +135,37 @@
     image_os:
       - ubuntu
       - centos
-    version:
-      - v1b1:
+    capm3_target_branch:
+      - main:
           capi_version: v1beta1
           capm3_version: v1beta1
+          capm3_release_branch: main
           target_branches:
-            - 'master'
             - 'main'
-      - v1a5:
-          capi_version: v1alpha4
-          capm3_version: v1alpha5
+      - release-1-4:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.4
           target_branches:
-            - 'master'
             - 'main'
-            - 'release-0.5'
-            - 'release-0.1'
+            - 'release-1.4'
+      - release-1-3:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.3
+          target_branches:
+            - 'main'
+            - 'release-1.3'
+      - release-1-2:
+          capi_version: v1beta1
+          capm3_version: v1beta1
+          capm3_release_branch: release-1.2
+          target_branches:
+            - 'main'
+            - 'release-1.2'
     jobs:
       - keep_integration_tests
 
-- project:
-    name: feature-tests
-    org: metal3-io
-    proj:
-      - metal3_dev_env:
-          repo: metal3-dev-env
-      - project_infra:
-          repo: project-infra
-          branch: '${{ghprbActualCommit}}'
-          ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-      - bmo:
-          repo: baremetal-operator
-    image_os:
-      - ubuntu
-      - centos
-    exclude:
-      - proj: bmo
-        image_os: centos
-    jobs:
-      - feature_tests
-      - feature_tests_upgrade:
-          exclude:
-            - image_os: centos
-            - proj: bmo
-
 - project:
     name: metal3-dev-env-main-tests
     org: metal3-io
@@ -179,19 +174,27 @@
       - ubuntu
       - centos
     jobs:
-      - main_feature_tests
-      - main_feature_tests_upgrade:
-          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:
-                capi_version: v1alpha4
-                capm3_version: v1alpha5
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.4
+                schedule: "30 4 * * *"
+            - release-1-3:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.3
+                schedule: "30 4 * * *"
+            - release-1-2:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.2
                 schedule: "30 4 * * *"
 
 - project:
@@ -221,40 +224,361 @@
 
 - project:
     name: "capm3"
-    repo:
-      org: "metal3-io"
-      name: "cluster-api-provider-metal3"
+    org: metal3-io
+    proj:
+      - capm3:
+          repo: cluster-api-provider-metal3
+      - metal3_dev_env:
+          repo: metal3-dev-env
+      - project_infra:
+          repo: project-infra
+          branch: '${{ghprbActualCommit}}'
+          ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
+      - bmo:
+          repo: baremetal-operator
+      - ipam:
+          repo: ip-address-manager
     image_os:
       - ubuntu
       - centos
     jobs:
-      - capm3_e2e_upgrade_tests:
+      - capm3_e2e_clusterctl_upgrade_tests:
+          upgrade_from_release:
+            - from-release-1-4:
+                upgrade_from: v1.4.
+            - from-release-1-3:
+                upgrade_from: v1.3.
+            - from-release-1-2:
+                upgrade_from: v1.2.
+            - from-release-0-5:
+                upgrade_from: v0.5.
           exclude:
             - image_os: centos
-      - capm3_e2e_tests:
-          version:
-            - v1b1:
+      - capm3_e2e_k8s_upgrade_tests:
+          k8s_versions:
+            - 1-27-1-28:
+                k8s_version_upgrade_from: v1.27.4
+                k8s_version_upgrade_to: v1.28.1
+                capm3_release_branch: main
+                capm3_target_branch: main
+                target_branches:
+                  - 'main'
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.4
+                capm3_release_branch: main
+                capm3_target_branch: main
+                target_branches:
+                  - 'main'
+            - 1-25-1-26:
+                k8s_version_upgrade_from: v1.25.5
+                k8s_version_upgrade_to: v1.26.4
+                capm3_release_branch: main
+                capm3_target_branch: main
+                target_branches:
+                  - 'main'
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.4
+                capm3_release_branch: release-1.4
+                capm3_target_branch: release-1-4
+                target_branches:
+                  - 'release-1.4'
+            - 1-25-1-26:
+                k8s_version_upgrade_from: v1.25.5
+                k8s_version_upgrade_to: v1.26.4
+                capm3_release_branch: release-1.3
+                capm3_target_branch: release-1-3
+                target_branches:
+                  - 'release-1.3'
+            - 1-25-1-26:
+                k8s_version_upgrade_from: v1.25.5
+                k8s_version_upgrade_to: v1.26.4
+                capm3_release_branch: release-1.2
+                capm3_target_branch: release-1-2
+                target_branches:
+                  - 'release-1.2'
+          exclude:
+              - image_os: centos
+      - capm3_e2e_integration_tests:
+          capm3_target_branch:
+            - main:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: main
+                target_branches:
+                  - 'main'
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.4
+                target_branches:
+                  - 'main'
+                  - 'release-1.4'
+      - capm3_e2e_basic_tests:
+          capm3_target_branch:
+            - main:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: main
+                target_branches:
+                  - 'main'
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.4
+                target_branches:
+                  - 'main'
+                  - 'release-1.4'
+      - capm3_e2e_feature_tests:
+          capm3_target_branch:
+            - main:
                 capi_version: v1beta1
                 capm3_version: v1beta1
+                capm3_release_branch: main
                 target_branches:
-                  - 'master'
                   - 'main'
-            - v1a5:
-                capi_version: v1alpha4
-                capm3_version: v1alpha5
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.4
+                target_branches:
+                  - 'release-1.4'
+            - release-1-3:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.3
+                target_branches:
+                  - 'release-1.3'
+            - release-1-2:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.2
+                target_branches:
+                  - 'release-1.2'
+      - keep_capm3_e2e_integration_tests:
+          capm3_target_branch:
+            - main:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: main
+                target_branches:
+                  - 'main'
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.4
                 target_branches:
-                  - 'master'
                   - 'main'
-                  - 'release-0.5'
-      - capm3_main_e2e_tests:
-          version:
-            - v1b1:
+                  - 'release-1.4'
+      - keep_capm3_e2e_basic_tests:
+          capm3_target_branch:
+            - main:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: main
+                target_branches:
+                  - 'main'
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.4
+                target_branches:
+                  - 'main'
+                  - 'release-1.4'
+      - keep_capm3_e2e_feature_tests:
+          capm3_target_branch:
+            - main:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: main
+                target_branches:
+                  - 'main'
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.4
+                target_branches:
+                  - 'release-1.4'
+            - release-1-3:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.3
+                target_branches:
+                  - 'release-1.3'
+            - release-1-2:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.2
+                target_branches:
+                  - 'release-1.2'
+      - keep_capm3_e2e_clusterctl_upgrade_tests:
+          upgrade_from_release:
+            - from-release-1-4:
+                upgrade_from: v1.4.
+            - from-release-1-3:
+                upgrade_from: v1.3.
+            - from-release-1-2:
+                upgrade_from: v1.2.
+            - from-release-0-5:
+                upgrade_from: v0.5.
+          exclude:
+            - image_os: centos
+      - keep_capm3_e2e_k8s_upgrade_tests:
+          k8s_versions:
+            - 1-27-1-28:
+                k8s_version_upgrade_from: v1.27.4
+                k8s_version_upgrade_to: v1.28.1
+                capm3_release_branch: main
+                capm3_target_branch: main
+                target_branches:
+                  - 'main'
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.4
+                capm3_release_branch: main
+                capm3_target_branch: main
+                target_branches:
+                  - 'main'
+            - 1-25-1-26:
+                k8s_version_upgrade_from: v1.25.5
+                k8s_version_upgrade_to: v1.26.4
+                capm3_release_branch: main
+                capm3_target_branch: main
+                target_branches:
+                  - 'main'
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.4
+                capm3_release_branch: release-1.4
+                capm3_target_branch: release-1-4
+                target_branches:
+                  - 'release-1.4'
+            - 1-25-1-26:
+                k8s_version_upgrade_from: v1.25.5
+                k8s_version_upgrade_to: v1.26.4
+                capm3_release_branch: release-1.3
+                capm3_target_branch: release-1-3
+                target_branches:
+                  - 'release-1.3'
+            - 1-25-1-26:
+                k8s_version_upgrade_from: v1.25.5
+                k8s_version_upgrade_to: v1.26.4
+                capm3_release_branch: release-1.2
+                capm3_target_branch: release-1-2
+                target_branches:
+                  - 'release-1.2'
+          exclude:
+            - image_os: centos
+
+- project:
+    name: "capm3-main-tests"
+    repo:
+      org: "metal3-io"
+      name: "cluster-api-provider-metal3"
+    image_os:
+      - ubuntu
+      - centos
+    jobs:
+      - capm3_main_e2e_clusterctl_upgrade_tests:
+          upgrade_from_release:
+            - from-release-1-4:
+                upgrade_from: v1.4.
+            - from-release-1-3:
+                upgrade_from: v1.3.
+            - from-release-1-2:
+                upgrade_from: v1.2.
+            - from-release-0-5:
+                upgrade_from: v0.5.
+          exclude:
+            - image_os: centos
+      - capm3_main_e2e_k8s_upgrade_tests:
+          k8s_versions:
+            - 1-27-1-28:
+                k8s_version_upgrade_from: v1.27.4
+                k8s_version_upgrade_to: v1.28.1
+                capm3_release_branch: main
+                capm3_target_branch: main
+                target_branches:
+                  - 'main'
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.4
+                capm3_release_branch: main
+                capm3_target_branch: main
+            - 1-25-1-26:
+                k8s_version_upgrade_from: v1.25.5
+                k8s_version_upgrade_to: v1.26.4
+                capm3_release_branch: main
+                capm3_target_branch: main
+            - 1-26-1-27:
+                k8s_version_upgrade_from: v1.26.4
+                k8s_version_upgrade_to: v1.27.4
+                capm3_release_branch: release-1.4
+                capm3_target_branch: release-1-4
+            - 1-25-1-26:
+                k8s_version_upgrade_from: v1.25.5
+                k8s_version_upgrade_to: v1.26.4
+                capm3_release_branch: release-1.3
+                capm3_target_branch: release-1-3
+            - 1-25-1-26:
+                k8s_version_upgrade_from: v1.25.5
+                k8s_version_upgrade_to: v1.26.4
+                capm3_release_branch: release-1.2
+                capm3_target_branch: release-1-2
+          exclude:
+              - image_os: centos
+      - capm3_main_e2e_ephemeral_tests:
+          exclude:
+            - image_os: ubuntu
+      - capm3_main_e2e_integration_tests:
+          capm3_target_branch:
+            - main:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: main
+                schedule: "H 4 * * *"
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_release_branch: release-1.4
+                schedule: "30 4 * * *"
+      - capm3_main_e2e_feature_tests:
+          capm3_target_branch:
+            - main:
                 capi_version: v1beta1
                 capm3_version: v1beta1
                 capm3_branch: main
-                schedule: "H 20 * * *"
-            - v1a5:
-                capi_version: v1alpha4
-                capm3_version: v1alpha5
-                capm3_branch: release-0.5
-                schedule: "H 20 * * *"
+                capm3_release_branch: main
+                schedule: "H 2 * * *"
+            - release-1-4:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_branch: release-1.4
+                capm3_release_branch: release-1.4
+                schedule: "H 5 * * *"
+            - release-1-3:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_branch: release-1.3
+                capm3_release_branch: release-1.3
+                schedule: "H 8 * * *"
+            - release-1-2:
+                capi_version: v1beta1
+                capm3_version: v1beta1
+                capm3_branch: release-1.2
+                capm3_release_branch: release-1.2
+                schedule: "H 11 * * *"
+
+- project:
+    name: 'ironic_image_build_tests'
+    org: metal3-io
+    proj:
+      - project_infra:
+          repo: project-infra
+          branch: '${{ghprbActualCommit}}'
+          ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
+      - ironic_image:
+          repo: ironic-image
+    jobs:
+      - ironic_image_build_tests