Merge "Remove outdated integration tests and openstack image building test files"
diff --git a/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml b/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml
index 96a6b7e..3750f46 100644
--- a/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml
+++ b/jjb/metal3/baremetal-operator/jjb-bmo-e2e.yaml
@@ -27,20 +27,19 @@
# Run at 03:45 (UTC) every day
- timed: "45 3 * * *"
- # Pediodic jobs for release-0.6 branch
+ # Pediodic jobs for release branches
- "{job_prefix}-{name}-e2e-test-{type}":
type: periodic-release-0.6
BRANCH_NAME: "release-0.6"
triggers:
- # Run at 01:45 (UTC) every day
- - timed: "45 1 * * *"
+ # Run at 01:45 (UTC) every odd day
+ - timed: "45 1 1-31/2 * *"
- "{job_prefix}-{name}-e2e-test-{type}":
- type: optional-periodic-release-0.6
- BRANCH_NAME: "release-0.6"
- GINKGO_FOCUS: "upgrade"
+ type: periodic-release-0.5
+ BRANCH_NAME: "release-0.5"
triggers:
- # Run at 01:45 (UTC) every day
- - timed: "45 1 * * *"
+ # Run at 01:45 (UTC) every even day
+ - timed: "45 1 2-30/2 * *"
- job-template:
name: "{job_prefix}-{name}-e2e-test-{type}"
diff --git a/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
index cf3fa94..ad874a1 100644
--- a/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
+++ b/jjb/metal3/job_capm3_periodic_e2e_clusterctl_upgrade_tests_prow.yml
@@ -101,7 +101,7 @@
artifact-num-to-keep: -1
triggers:
- - timed: "H 1 1-31/2 * *" # Runs on odd days 1 AM
+ - timed: '{schedule}'
pipeline-scm:
scm:
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 4c9ef31..d49d5ac 100644
--- 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 5f07cb7..eab6bdd 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -247,15 +247,19 @@
- main:
capm3_release_branch: main
bmo_release_branch: main
+ schedule: "H 1 * * TUE,THU,SAT"
- release-1-7:
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
+ schedule: "H 1 * * MON"
- release-1-6:
capm3_release_branch: release-1.6
bmo_release_branch: release-0.5
+ schedule: "H 1 * * WED"
- release-1-5:
capm3_release_branch: release-1.5
bmo_release_branch: release-0.4
+ schedule: "H 1 * * FRI"
exclude:
- image_os: centos
- capm3_periodic_e2e_k8s_upgrade_tests_prow:
@@ -267,6 +271,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
@@ -274,6 +279,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
@@ -281,6 +287,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
@@ -288,6 +295,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
@@ -295,6 +303,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
@@ -302,6 +311,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:
@@ -443,9 +453,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 * * *"