X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fmetal3%2Fprojects.yml;h=ab1f64ae3606fad69ad37e0ae41dfb8ac24fbb61;hb=HEAD;hp=8402afacd7b0cb6af2b6df2296382c0d458236b5;hpb=108c0cb62c3677e0bc5fef183019b06a50771cc6;p=infra%2Fcicd.git

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 8402afac..b750a801 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -34,20 +34,13 @@
     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"
-      name: "metal3-dev-tools"
+        org: "Nordix"
+        name: "metal3-dev-tools"
     ci_github_jenkins_credentials_id: 'nordix-metal3-ci-github-prod-token'
     ci_ghprb_auth_id: '86c49704-5474-4524-97b7-805323b2c39a'
     ci_github_repo: 'https://github.com/Nordix/metal3-dev-tools.git'
@@ -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-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
-        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'
-    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-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
-            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 * * *"
+    - 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'
@@ -192,10 +68,11 @@
 - project:
     name: 'project_infra'
     repo:
-      org: "metal3-io"
-      name: "project-infra"
+        org: "metal3-io"
+        name: "project-infra"
     jobs:
     - fullstack_project-infra_building_test
+    - periodic_dynamic_fullstack_building
 
 - project:
     name: "capm3-prow"
@@ -232,19 +109,19 @@
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            schedule: "H 4 * * *"
+            schedule: "H 1 * * *"
         - release-1-7:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.7
             bmo_release_branch: release-0.6
-            schedule: "30 4 * * *"
+            schedule: "30 1 * * *"
         - release-1-6:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
-            schedule: "30 4 * * *"
+            schedule: "30 1 * * *"
     - capm3_e2e_feature_tests_prow:
         capm3_target_branch:
         - main:
@@ -274,25 +151,27 @@
             capm3_version: v1beta1
             capm3_release_branch: main
             bmo_release_branch: main
-            schedule: "H 2 * * *"
+            schedule: "H 19 2-30/2 * *" # Runs on even days 7 PM
         - release-1-7:
             capi_version: v1beta1
             capm3_version: v1beta1
             capm3_release_branch: release-1.7
             bmo_release_branch: release-0.6
-            schedule: "H 2 * * *"
+            schedule: "H 0 2-30/2 * *" # Runs on even days 0 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 5 2-30/2 * *" # Runs on even days 5 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 * * *"
+            schedule: "H 10 2-30/2 * *" # Runs on even days 10 AM
+        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:
@@ -311,31 +190,17 @@
         - 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
-            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
+        - 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-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-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: release-1.7
             bmo_release_branch: release-0.6
             capm3_target_branch: release-1-7
@@ -360,47 +225,39 @@
         - main:
             capm3_release_branch: main
             bmo_release_branch: main
+            schedule: "H 22 * * 1,3,5"
         - release-1-7:
             capm3_release_branch: release-1.7
             bmo_release_branch: release-0.6
+            schedule: "H 22 * * 0"
         - release-1-6:
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
+            schedule: "H 22 * * 2"
         - release-1-5:
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
+            schedule: "H 22 * * 4"
         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
-        - 1-28-1-29:
-            k8s_version_upgrade_from: v1.28.1
-            k8s_version_upgrade_to: v1.29.0
-            kubectl_sha256: 0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5 # v1.29.0
+            schedule: "H 3 * * 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 3 * * 2"
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
@@ -408,6 +265,7 @@
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             capm3_target_branch: release-1-6
+            schedule: "H 3 * * 3"
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
@@ -415,34 +273,19 @@
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
+            schedule: "H 3 * * 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
 
-- project:
-    name: 'ironic_image_build_tests'
-    org: metal3-io
-    proj:
-    - project_infra:
-        repo: project-infra
-        branch: '${{ghprbActualCommit}}'
-        ci_github_repo: '${{ghprbAuthorRepoGitUrl}}'
-    - ironic_image:
-        repo: ironic-image
-    jobs:
-    - ironic_image_build_tests
-
 - project:
     name: 'container_image_build'
     org: metal3-io
@@ -558,10 +401,4 @@
             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 * * *"
+            schedule: "H 3 * * *"