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

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 08936097..723fdbbf 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -111,17 +111,6 @@
           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'
-    exclude:
-      - proj: ironic_ipa_downloader
-        image_os: centos
-        capm3_target_branch: release-1-1
     jobs:
       - integration_tests
 
@@ -174,37 +163,9 @@
           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'
     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
-
 - project:
     name: metal3-dev-env-main-tests
     org: metal3-io
@@ -213,7 +174,6 @@
       - ubuntu
       - centos
     jobs:
-      - main_feature_tests
       - capm3_main_integration_tests:
           capm3_target_branch:
             - main:
@@ -236,11 +196,6 @@
                 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 * * *"
 
 - project:
     name: bml-tests
@@ -286,46 +241,65 @@
     image_os:
       - ubuntu
       - centos
-    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'
-      - release-1-1:
-          capi_version: v1beta1
-          capm3_version: v1beta1
-          capm3_release_branch: release-1.1
-          target_branches:
-            - 'release-1.1'
     jobs:
-      - capm3_e2e_upgrade_tests:
+      - capm3_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
-            - from-release-1-1:
-                upgrade_from: v1.1.
+            - 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_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:
@@ -341,8 +315,47 @@
                 target_branches:
                   - 'main'
                   - 'release-1.4'
-      - parallel_capm3_e2e_feature_tests:
+      - 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:
+                  - '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_integration_tests:
           capm3_target_branch:
             - main:
@@ -358,8 +371,103 @@
                 target_branches:
                   - 'main'
                   - '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:
-      - keep_capm3_e2e_upgrade_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
 
@@ -372,14 +480,54 @@
       - ubuntu
       - centos
     jobs:
-      - capm3_main_e2e_upgrade_tests:
+      - capm3_main_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
-            - from-release-1-1:
-                upgrade_from: v1.1.
+            - 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
@@ -421,12 +569,6 @@
                 capm3_branch: release-1.2
                 capm3_release_branch: release-1.2
                 schedule: "H 11 * * *"
-            - release-1-1:
-                capi_version: v1beta1
-                capm3_version: v1beta1
-                capm3_branch: release-1.1
-                capm3_release_branch: release-1.1
-                schedule: "H 14 * * *"
 
 - project:
     name: 'ironic_image_build_tests'