From 9e2b3696a13146814dba9fa50a7049fb7efa6eb0 Mon Sep 17 00:00:00 2001 From: Huy Mai Date: Fri, 12 Apr 2024 13:12:28 +0300 Subject: [PATCH] Add release-1.7 branch configurations for CAPM3/IPAM repos Signed-off-by: Huy Mai Change-Id: I40e914c11563c48738cf404a73038073a98ac4e8 --- jjb/metal3/job_capm3_e2e_basic_tests.yml | 9 ++ jjb/metal3/projects.yml | 111 ++++++++++++++--------- 2 files changed, 75 insertions(+), 45 deletions(-) diff --git a/jjb/metal3/job_capm3_e2e_basic_tests.yml b/jjb/metal3/job_capm3_e2e_basic_tests.yml index 80292e8d2..0be105003 100644 --- a/jjb/metal3/job_capm3_e2e_basic_tests.yml +++ b/jjb/metal3/job_capm3_e2e_basic_tests.yml @@ -130,6 +130,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 diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml index f935b1ee3..e4ea4b767 100644 --- a/jjb/metal3/projects.yml +++ b/jjb/metal3/projects.yml @@ -102,6 +102,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 @@ -120,15 +129,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' jobs: - integration_tests @@ -148,6 +148,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 @@ -160,12 +166,6 @@ 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 * * *" - project: name: bml-tests @@ -210,6 +210,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 +225,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 +233,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 +252,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 +267,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: @@ -269,6 +275,12 @@ capm3_release_branch: main bmo_release_branch: main schedule: "H 2 * * *" + - release-1-7: + capi_version: v1beta1 + capm3_version: v1beta1 + capm3_release_branch: release-1.7 + bmo_release_branch: release-0.6 + schedule: "H 2 * * *" - release-1-6: capi_version: v1beta1 capm3_version: v1beta1 @@ -292,15 +304,15 @@ - 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: @@ -326,6 +338,13 @@ 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 + 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 +359,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,15 +366,15 @@ - 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_periodic_e2e_k8s_upgrade_tests_prow: @@ -388,6 +400,13 @@ 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 + 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 @@ -402,13 +421,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 - project: @@ -518,6 +530,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 -- 2.25.1