Merge "Adjust BMO periodic e2e frequencies"

diff --git a/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
index 4c9ef31d08f7f1ab9a71bbd1308c795698ff7eb3..d49d5acf5e72658e9266ddb417212a9381a2ee51 100644 (file)
--- a/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_k8s_upgrade_tests_prow.yml
@@ -113,7 +113,7 @@
         artifact-num-to-keep: -1
 
     triggers:
-      - timed: "H 20 1-31/2 * *" # Runs on odd days 8 PM
+      - timed: "{schedule}"
 
     pipeline-scm:
       scm:

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 596f12ed65c5ceed2ab149175e055876c1ba108c..88f7244004604b1a826f82fea52c0a45c61b6471 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -346,6 +346,7 @@
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
+            schedule: "H 4 * * MON"
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
@@ -353,6 +354,7 @@
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
+            schedule: "H 4 * * THU"
         - 1-27-1-28:
             k8s_version_upgrade_from: v1.27.4
             k8s_version_upgrade_to: v1.28.1
@@ -360,6 +362,7 @@
             capm3_release_branch: main
             bmo_release_branch: main
             capm3_target_branch: main
+            schedule: "H 4 * * FRI"
         - 1-29-1-30:
             k8s_version_upgrade_from: v1.29.0
             k8s_version_upgrade_to: v1.30.0
@@ -367,6 +370,7 @@
             capm3_release_branch: release-1.7
             bmo_release_branch: release-0.6
             capm3_target_branch: release-1-7
+            schedule: "H 4 * * TUE"
         - 1-28-1-29:
             k8s_version_upgrade_from: v1.28.1
             k8s_version_upgrade_to: v1.29.0
@@ -374,6 +378,7 @@
             capm3_release_branch: release-1.6
             bmo_release_branch: release-0.5
             capm3_target_branch: release-1-6
+            schedule: "H 4 * * WED"
         - 1-26-1-27:
             k8s_version_upgrade_from: v1.26.4
             k8s_version_upgrade_to: v1.27.4
@@ -381,6 +386,7 @@
             capm3_release_branch: release-1.5
             bmo_release_branch: release-0.4
             capm3_target_branch: release-1-5
+            schedule: "H 4 * * SAT"
         exclude:
         - image_os: centos
     - capm3_periodic_e2e_ephemeral_tests:
@@ -522,9 +528,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 * * *"