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

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 7d8b657d..723fdbbf 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -166,27 +166,6 @@
     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
@@ -195,7 +174,6 @@
       - ubuntu
       - centos
     jobs:
-      - main_feature_tests
       - capm3_main_integration_tests:
           capm3_target_branch:
             - main:
@@ -263,33 +241,8 @@
     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'
     jobs:
-      - capm3_e2e_upgrade_tests:
+      - capm3_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
             - from-release-1-4:
                 upgrade_from: v1.4.
@@ -301,6 +254,52 @@
                 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:
@@ -316,7 +315,47 @@
                 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:
+                  - '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:
@@ -332,8 +371,48 @@
                 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.
@@ -345,6 +424,52 @@
                 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"
@@ -355,7 +480,7 @@
       - ubuntu
       - centos
     jobs:
-      - capm3_main_e2e_upgrade_tests:
+      - capm3_main_e2e_clusterctl_upgrade_tests:
           upgrade_from_release:
             - from-release-1-4:
                 upgrade_from: v1.4.
@@ -367,6 +492,42 @@
                 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