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

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 72dce66a..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:
@@ -278,9 +256,16 @@
             - 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.1
+                k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: main
                 capm3_target_branch: main
                 target_branches:
@@ -292,16 +277,9 @@
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
-            - 1-24-1-25:
-                k8s_version_upgrade_from: v1.24.9
-                k8s_version_upgrade_to: v1.25.5
-                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.1
+                k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: release-1.4
                 capm3_target_branch: release-1-4
                 target_branches:
@@ -337,6 +315,21 @@
                 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:
@@ -378,6 +371,21 @@
                 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:
           capm3_target_branch:
             - main:
@@ -418,9 +426,16 @@
             - 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.1
+                k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: main
                 capm3_target_branch: main
                 target_branches:
@@ -432,16 +447,9 @@
                 capm3_target_branch: main
                 target_branches:
                   - 'main'
-            - 1-24-1-25:
-                k8s_version_upgrade_from: v1.24.9
-                k8s_version_upgrade_to: v1.25.5
-                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.1
+                k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: release-1.4
                 capm3_target_branch: release-1-4
                 target_branches:
@@ -486,9 +494,16 @@
             - 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.1
+                k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: main
                 capm3_target_branch: main
             - 1-25-1-26:
@@ -496,14 +511,9 @@
                 k8s_version_upgrade_to: v1.26.4
                 capm3_release_branch: main
                 capm3_target_branch: main
-            - 1-24-1-25:
-                k8s_version_upgrade_from: v1.24.9
-                k8s_version_upgrade_to: v1.25.5
-                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.1
+                k8s_version_upgrade_to: v1.27.4
                 capm3_release_branch: release-1.4
                 capm3_target_branch: release-1-4
             - 1-25-1-26: