X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;h=1dda52333e40c5d022841a5ea305b05b9adbbdf0;hb=308cb6993888a6b695da7ba08a28b57db5f71449;hp=f935b1ee3a656931c020cbeeb1b03f21e875183b;hpb=a3510a58c93e5413cfe6edba5c8d42334e842663;p=infra%2Fcicd.git

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index f935b1ee..1dda5233 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -34,16 +34,9 @@
     ci_github_whitelist_org:
     - nordix-metal3
     jobs:
-    - openstack_image_building
-    - openstack_node_image_building
-    - docker_image_building
     - update_nordix_repos
     - periodic_fullstack_building
     - fullstack_building_test
-    - metal3_dev_tools_integration_test:
-        image_os:
-        - ubuntu
-        - centos
     - artifact_cleanup
     repo:
       org: "Nordix"
@@ -56,132 +49,15 @@
     name: 'image_building'
     jobs:
     - ci_image_building
-
-- project:
-    name: integration-tests
-    org: metal3-io
-    proj:
-    - metal3_dev_env:
-        repo: metal3-dev-env
-    - project_infra:
-        repo: project-infra
-        branch: '${{ghprbActualCommit}}'
-        ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - capm3:
-        repo: cluster-api-provider-metal3
-    - bmo:
-        repo: baremetal-operator
-    - ipam:
-        repo: ip-address-manager
-    - ironic_image:
-        repo: ironic-image
-        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:
-        repo: ironic-ipa-downloader
-    - mariadb_image:
-        repo: mariadb-image
-        build_mariadb_image_locally: 'true'
-        ironic_use_mariadb: 'true'
-    image_os:
-    - ubuntu
-    - centos
-    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:
-        - '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'
-    jobs:
-    - integration_tests
-
-- project:
-    name: metal3-dev-env-main-tests
-    org: metal3-io
-    repo: metal3-dev-env
-    image_os:
-    - ubuntu
-    - centos
-    jobs:
-    - capm3_periodic_integration_tests:
-        capm3_target_branch:
-        - main:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: main
-            bmo_release_branch: main
-            schedule: "H 4 * * *"
-        - release-1-6:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.6
-            bmo_release_branch: release-0.5
-            schedule: "30 4 * * *"
-        - release-1-5:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.5
-            bmo_release_branch: release-0.4
-            schedule: "30 4 * * *"
-        - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-            schedule: "30 4 * * *"
+    - node_image_building
 
 - project:
     name: bml-tests
     org: metal3-io
     image_os: centos
     jobs:
-    - bml_integration_tests:
-        proj:
-        - metal3_dev_env:
-            repo: metal3-dev-env
-        - project_infra:
-            repo: project-infra
-            branch: '${{ghprbActualCommit}}'
-            ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - bml_periodic_integration_tests:
-        repo: metal3-dev-env
+    - bml_integration_tests
+    - bml_periodic_integration_tests
 
 - project:
     name: 'project_infra_cleanup'
@@ -210,6 +86,11 @@
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
@@ -220,11 +101,6 @@
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-        - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
     - capm3_periodic_e2e_integration_tests_prow:
         capm3_target_branch:
         - main:
@@ -233,6 +109,12 @@
             capm3_release_branch: main
             bmo_release_branch: main
             schedule: "H 4 * * *"
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            schedule: "30 4 * * *"
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
@@ -246,6 +128,11 @@
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
@@ -256,11 +143,6 @@
             capm3_version: v1beta1
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
-        - release-1-4:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
     - capm3_periodic_e2e_feature_tests_prow:
         capm3_target_branch:
         - main:
@@ -268,64 +150,59 @@
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            schedule: "H 2 * * *"
+            schedule: "H 22 2-30/2 * *" # Runs on even days 10 PM
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            schedule: "H 3 2-30/2 * *" # Runs on even days 3 AM
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            schedule: "H 8 * * *"
+            schedule: "H 8 2-30/2 * *" # Runs on even days 8 AM
         - release-1-5:
             capi_version: v1beta1
             capm3_version: v1beta1
             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_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-            schedule: "H 5 * * *"
+            schedule: "H 13 2-30/2 * *" # Runs on even days 1 PM
+        exclude:
+        - image_os: ubuntu # This is to disable the tests running on ubuntu, to save resources
     - capm3_e2e_clusterctl_upgrade_tests_prow:
         capm3_target_branch:
         - main:
             capm3_release_branch: main
             bmo_release_branch: main
+        - release-1-7:
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
         - 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_e2e_k8s_upgrade_tests_prow:
         k8s_versions:
-        - 1-28-1-29:
-            k8s_version_upgrade_from: v1.28.1
-            k8s_version_upgrade_to: v1.29.0
-            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
+        - 1-29-1-30:
+            k8s_version_upgrade_from: v1.29.0
+            k8s_version_upgrade_to: v1.30.0
+            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
-        - 1-27-1-28:
-            k8s_version_upgrade_from: v1.27.4
-            k8s_version_upgrade_to: v1.28.1
-            kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
-            capm3_release_branch: main
-            bmo_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
-            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
-            capm3_release_branch: main
-            capm3_target_branch: main
-            bmo_release_branch: main
+        - 1-29-1-30:
+            k8s_version_upgrade_from: v1.29.0
+            k8s_version_upgrade_to: v1.30.0
+            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            capm3_target_branch: release-1-7
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
@@ -340,13 +217,6 @@
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
-        - 1-26-1-27:
-            k8s_version_upgrade_from: v1.26.4
-            kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
-            k8s_version_upgrade_to: v1.27.4
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-            capm3_target_branch: release-1-4
         exclude:
         - image_os: centos
     - capm3_periodic_e2e_clusterctl_upgrade_tests_prow:
@@ -354,40 +224,39 @@
         - main:
             capm3_release_branch: main
             bmo_release_branch: main
+            schedule: "H 1 * * 2,4,6"
+        - release-1-7:
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            schedule: "H 1 * * 1"
         - release-1-6:
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
+            schedule: "H 1 * * 3"
         - 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
+            schedule: "H 1 * * 5"
         exclude:
         - image_os: centos
     - capm3_periodic_e2e_k8s_upgrade_tests_prow:
         k8s_versions:
-        - 1-28-1-29:
-            k8s_version_upgrade_from: v1.28.1
-            k8s_version_upgrade_to: v1.29.0
-            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
-            capm3_release_branch: main
-            bmo_release_branch: main
-            capm3_target_branch: main
-        - 1-27-1-28:
-            k8s_version_upgrade_from: v1.27.4
-            k8s_version_upgrade_to: v1.28.1
-            kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1
-            capm3_release_branch: main
-            bmo_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
-            kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
+        - 1-29-1-30:
+            k8s_version_upgrade_from: v1.29.0
+            k8s_version_upgrade_to: v1.30.0
+            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
+            schedule: "H 4 * * 1"
+        - 1-29-1-30:
+            k8s_version_upgrade_from: v1.29.0
+            k8s_version_upgrade_to: v1.30.0
+            kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            capm3_target_branch: release-1-7
+            schedule: "H 4 * * 2"
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
@@ -395,6 +264,7 @@
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             capm3_target_branch: release-1-6
+            schedule: "H 4 * * 3"
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
@@ -402,25 +272,16 @@
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
-        - 1-26-1-27:
-            k8s_version_upgrade_from: v1.26.4
-            kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4
-            k8s_version_upgrade_to: v1.27.4
-            capm3_release_branch: release-1.4
-            bmo_release_branch: release-0.3
-            capm3_target_branch: release-1-4
+            schedule: "H 4 * * 6"
         exclude:
         - image_os: centos
-- project:
-    name: "capm3-periodic-tests"
-    repo:
-      org: "metal3-io"
-      name: "cluster-api-provider-metal3"
-    image_os:
-    - ubuntu
-    - centos
-    jobs:
     - capm3_periodic_e2e_ephemeral_tests:
+        capm3_target_branch:
+        - main:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: main
+            bmo_release_branch: main
         exclude:
         - image_os: ubuntu
 
@@ -518,6 +379,15 @@
             bmo_release_branch: main
             target_branches:
             - 'main'
+        - release-1-7:
+            capi_version: v1beta1
+            capm3_version: v1beta1
+            capm3_release_branch: release-1.7
+            bmo_release_branch: release-0.6
+            target_branches:
+            - 'main'
+            - 'release-1.7'
+            - 'release-0.6'
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
@@ -536,15 +406,6 @@
             - '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'
     - dev_env_periodic_integration_tests_prow:
         capm3_target_branch:
         - main:
@@ -553,9 +414,3 @@
             capm3_release_branch: main
             bmo_release_branch: main
             schedule: "H 4 * * *"
-        - release-1-6:
-            capi_version: v1beta1
-            capm3_version: v1beta1
-            capm3_release_branch: release-1.6
-            bmo_release_branch: release-0.5
-            schedule: "30 4 * * *"