Rename SKIP_DELETION variable into KEEP_TEST_ENV

[infra/cicd.git] / jjb / metal3 / projects.yml

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index e9cfdddd1d553f11508ea88e05743f2b9089afb2..0893609708ddd14cb1c53f1885ffc53880d52f7d 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -78,6 +78,8 @@
           repo: ironic-ipa-downloader
       - mariadb_image:
           repo: mariadb-image
+          build_mariadb_image_locally: 'true'
+          ironic_use_mariadb: 'true'
     image_os:
       - ubuntu
       - centos
@@ -88,6 +90,13 @@
           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'
       - release-1-3:
           capi_version: v1beta1
           capm3_version: v1beta1
@@ -144,6 +153,13 @@
           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'
       - release-1-3:
           capi_version: v1beta1
           capm3_version: v1beta1
@@ -188,10 +204,6 @@
         image_os: centos
     jobs:
       - feature_tests
-      - feature_tests_upgrade:
-          exclude:
-            - image_os: centos
-            - proj: bmo
 
 - project:
     name: metal3-dev-env-main-tests
@@ -202,9 +214,6 @@
       - centos
     jobs:
       - main_feature_tests
-      - main_feature_tests_upgrade:
-          exclude:
-            - image_os: centos
       - capm3_main_integration_tests:
           capm3_target_branch:
             - main:
@@ -212,6 +221,11 @@
                 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 * * *"
             - release-1-3:
                 capi_version: v1beta1
                 capm3_version: v1beta1
@@ -279,6 +293,12 @@
           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
@@ -299,12 +319,45 @@
             - 'release-1.1'
     jobs:
       - capm3_e2e_upgrade_tests:
+          upgrade_from_release:
+            - from-release-1-1:
+                upgrade_from: v1.1.
+            - from-release-0-5:
+                upgrade_from: v0.5.
           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'
       - parallel_capm3_e2e_feature_tests:
       - capm3_e2e_feature_tests:
       - 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:
+                  - 'main'
+                  - 'release-1.4'
       - keep_capm3_e2e_feature_tests:
       - keep_capm3_e2e_upgrade_tests:
           exclude:
@@ -320,12 +373,28 @@
       - centos
     jobs:
       - capm3_main_e2e_upgrade_tests:
+          upgrade_from_release:
+            - from-release-1-1:
+                upgrade_from: v1.1.
+            - from-release-0-5:
+                upgrade_from: v0.5.
           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:
@@ -333,25 +402,31 @@
                 capm3_version: v1beta1
                 capm3_branch: main
                 capm3_release_branch: main
-                schedule: "H 20 * * *"
+                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 23 * * *"
+                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 23 * * *"
+                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 23 * * *"
+                schedule: "H 14 * * *"
 
 - project:
     name: 'ironic_image_build_tests'