Merge "Add dev-env-integration test to prow"

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

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 036b2def1bc1ba2e1be057b6a60806959d6f1962..edd1133baf6a789c2c1fafa2be2001158dd2c447 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -38,7 +38,7 @@
     - openstack_node_image_building
     - docker_image_building
     - update_nordix_repos
-    - main_fullstack_building
+    - periodic_fullstack_building
     - fullstack_building_test
     - metal3_dev_tools_integration_test:
         image_os:
@@ -78,6 +78,11 @@
         name_postfix: '_ironic_from_source'
         trigger_postfix: '-ironic-source'
         ironic_install_type: 'source'
+        target_branches:
+        - 'main'
+        - 'release-23.1'
+        - 'release-24.0'
+        - 'release-24.1'
     - ironic_image:
         repo: ironic-image
     - ironic_ipa_downloader:
@@ -194,7 +199,7 @@
     - ubuntu
     - centos
     jobs:
-    - capm3_main_integration_tests:
+    - capm3_periodic_integration_tests:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
@@ -234,17 +239,14 @@
             repo: project-infra
             branch: '${{ghprbActualCommit}}'
             ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - bml_main_integration_tests:
+    - bml_periodic_integration_tests:
         repo: metal3-dev-env
 
 - project:
     name: 'project_infra_cleanup'
-    repo:
-      org: "metal3-io"
-      name: "project-infra"
     ci_github_pipeline: 'jenkins/jobs/integration_tests_clean.pipeline'
     jobs:
-    - main_clean
+    - periodic_clean
 
 - project:
     name: 'project_infra'
@@ -274,20 +276,6 @@
     - ubuntu
     - centos
     jobs:
-    - capm3_e2e_clusterctl_upgrade_tests:
-        upgrade_from_release:
-        - from-release-1-6:
-            upgrade_from: v1.6.
-        - from-release-1-5:
-            upgrade_from: v1.5.
-        - from-release-1-4:
-            upgrade_from: v1.4.
-        - from-release-1-3:
-            upgrade_from: v1.3.
-        - from-release-0-5:
-            upgrade_from: v0.5.
-        exclude:
-        - image_os: centos
     - capm3_e2e_k8s_upgrade_tests:
         k8s_versions:
         - 1-28-1-29:
@@ -629,36 +617,22 @@
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'main'
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'main'
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'main'
-            - 'release-1.4'
-            - 'release-0.3'
-    - capm3_main_e2e_integration_tests_prow:
+    - capm3_periodic_e2e_integration_tests_prow:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
@@ -679,35 +653,21 @@
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'main'
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'main'
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'main'
-            - 'release-1.4'
-            - 'release-0.3'
     - capm3_e2e_feature_tests_prow:
         capm3_target_branch:
         - main:
@@ -715,59 +675,44 @@
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
-    - capm3_main_e2e_feature_tests_prow:
+    - capm3_periodic_e2e_feature_tests_prow:
         capm3_target_branch:
         - main:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: main
             capm3_release_branch: main
             bmo_release_branch: main
             schedule: "H 2 * * *"
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: release-1.6
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             schedule: "H 8 * * *"
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: release-1.5
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             schedule: "H 11 * * *"
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
-            capm3_branch: release-1.4
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
             schedule: "H 5 * * *"
@@ -778,65 +723,35 @@
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
-    - capm3_clusterctl_upgrade_tests_prow:
+    - capm3_e2e_clusterctl_upgrade_tests_prow:
         capm3_target_branch:
         - main:
-            capi_version: v1beta1
-            capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - release-1-6:
-            capi_version: v1beta1
-            capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - release-1-5:
-            capi_version: v1beta1
-            capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
         exclude:
         - image_os: centos
     - capm3_e2e_k8s_upgrade_tests_prow:
@@ -848,8 +763,6 @@
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-27-1-28:
             k8s_version_upgrade_from: v1.27.4
             k8s_version_upgrade_to: v1.28.1
@@ -857,8 +770,6 @@
             capm3_release_branch: main
             bmo_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
@@ -866,8 +777,6 @@
             capm3_release_branch: main
             capm3_target_branch: main
             bmo_release_branch: main
-            target_branches:
-            - 'main'
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
@@ -875,9 +784,6 @@
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             capm3_target_branch: release-1-6
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
@@ -885,9 +791,6 @@
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
@@ -895,26 +798,25 @@
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
             capm3_target_branch: release-1-4
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
         exclude:
         - image_os: centos
-    - capm3_main_e2e_clusterctl_upgrade_tests_prow:
-        upgrade_from_release:
-        - from-release-1-6:
-            upgrade_from: v1.6.
-        - from-release-1-5:
-            upgrade_from: v1.5.
-        - from-release-1-4:
-            upgrade_from: v1.4.
-        - from-release-1-3:
-            upgrade_from: v1.3.
-        - from-release-0-5:
-            upgrade_from: v0.5.
+    - capm3_periodic_e2e_clusterctl_upgrade_tests_prow:
+        capm3_target_branch:
+        - main:
+            capm3_release_branch: main
+            bmo_release_branch: main
+        - release-1-6:
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+        - release-1-5:
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+        - release-1-4:
+            capm3_release_branch: release-1.4
+            bmo_release_branch: release-0.3
         exclude:
         - image_os: centos
-    - capm3_main_e2e_k8s_upgrade_tests_prow:
+    - capm3_periodic_e2e_k8s_upgrade_tests_prow:
         k8s_versions:
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
@@ -923,8 +825,6 @@
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-27-1-28:
             k8s_version_upgrade_from: v1.27.4
             k8s_version_upgrade_to: v1.28.1
@@ -932,8 +832,6 @@
             capm3_release_branch: main
             bmo_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
@@ -965,17 +863,19 @@
         exclude:
         - image_os: centos
     - keep_capm3_e2e_clusterctl_upgrade_tests_prow:
-        upgrade_from_release:
-        - from-release-1-6:
-            upgrade_from: v1.6.
-        - from-release-1-5:
-            upgrade_from: v1.5.
-        - from-release-1-4:
-            upgrade_from: v1.4.
-        - from-release-1-3:
-            upgrade_from: v1.3.
-        - from-release-0-5:
-            upgrade_from: v0.5.
+        capm3_target_branch:
+        - main:
+            capm3_release_branch: main
+            bmo_release_branch: main
+        - release-1-6:
+            capm3_release_branch: release-1.6
+            bmo_release_branch: release-0.5
+        - release-1-5:
+            capm3_release_branch: release-1.5
+            bmo_release_branch: release-0.4
+        - release-1-4:
+            capm3_release_branch: release-1.4
+            bmo_release_branch: release-0.3
         exclude:
         - image_os: centos
     - keep_capm3_e2e_k8s_upgrade_tests_prow:
@@ -987,8 +887,6 @@
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-27-1-28:
             k8s_version_upgrade_from: v1.27.4
             k8s_version_upgrade_to: v1.28.1
@@ -996,8 +894,6 @@
             capm3_release_branch: main
             bmo_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
@@ -1005,8 +901,6 @@
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-            target_branches:
-            - 'main'
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
@@ -1014,9 +908,6 @@
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             capm3_target_branch: release-1-6
-            target_branches:
-            - 'release-1.6'
-            - 'release-0.5'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
@@ -1024,9 +915,6 @@
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
-            target_branches:
-            - 'release-1.5'
-            - 'release-0.4'
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
@@ -1034,14 +922,11 @@
             capm3_release_branch: release-1.4
             bmo_release_branch: release-0.3
             capm3_target_branch: release-1-4
-            target_branches:
-            - 'release-1.4'
-            - 'release-0.3'
         exclude:
         - image_os: centos
 
 - project:
-    name: "capm3-main-tests"
+    name: "capm3-periodic-tests"
     repo:
       org: "metal3-io"
       name: "cluster-api-provider-metal3"
@@ -1049,10 +934,10 @@
     - ubuntu
     - centos
     jobs:
-    - capm3_main_e2e_ephemeral_tests:
+    - capm3_periodic_e2e_ephemeral_tests:
         exclude:
         - image_os: ubuntu
-    - capm3_main_e2e_integration_tests:
+    - capm3_periodic_e2e_integration_tests:
         capm3_target_branch:
         - main:
             capi_version: v1beta1