Fix periodic and keep upgrade clusterctl jjbs
Change-Id: Ic3c43a043e9b1d979cb1c1b9173b3c2bc0d904e3
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index d19e467..5a20c73 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -274,20 +274,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,35 +615,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_main_e2e_integration_tests_prow:
capm3_target_branch:
- main:
@@ -679,35 +651,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,32 +673,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:
- - '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_target_branch:
- main:
@@ -778,65 +725,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 +765,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 +772,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 +779,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 +786,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 +793,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,23 +800,22 @@
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_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:
@@ -923,8 +827,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 +834,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 +865,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 +889,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 +896,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 +903,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 +910,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 +917,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,9 +924,6 @@
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