From 65815345d00617ba8c237ce9db7d2ab4ebec135d Mon Sep 17 00:00:00 2001 From: Kashif Khan Date: Wed, 10 Jan 2024 13:54:21 +0200 Subject: [PATCH] Bump k8s, crictl, crio & kind node image version to v1.29.0. Also adds relevant upgrade tests Signed-off-by: Kashif Khan Change-Id: I4e6bbc4b67be36d41991f620be0291ab67ab95a5 --- jjb/metal3/job_openstack_image_building.yml | 6 +- .../job_openstack_node_image_building.yml | 8 +- jjb/metal3/projects.yml | 76 ++++++++++--------- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/jjb/metal3/job_openstack_image_building.yml b/jjb/metal3/job_openstack_image_building.yml index 761da949..7cad3c2d 100644 --- a/jjb/metal3/job_openstack_image_building.yml +++ b/jjb/metal3/job_openstack_image_building.yml @@ -37,15 +37,15 @@ parameters: - string: name: KUBERNETES_VERSION - default: "v1.28.1" + default: "v1.29.0" description: 'Kubernetes version' - string: name: KUBECTL_SHA256 - default: 'e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1' # v1.28.1 + default: '0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5' # v1.29.0 description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION' - string: name: KIND_NODE_IMAGE_VERSION - default: "v1.28.0" + default: "v1.29.0" description: 'Kind node container image version' properties: diff --git a/jjb/metal3/job_openstack_node_image_building.yml b/jjb/metal3/job_openstack_node_image_building.yml index 1da9ad30..f12d7181 100644 --- a/jjb/metal3/job_openstack_node_image_building.yml +++ b/jjb/metal3/job_openstack_node_image_building.yml @@ -37,19 +37,19 @@ parameters: - string: name: KUBERNETES_VERSION - default: "v1.28.1" + default: "v1.29.0" description: 'Kubernetes version' - string: name: KUBECTL_SHA256 - default: 'e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1' # v1.28.1 + default: '0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5' # v1.29.0 description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION' - string: name: CRICTL_VERSION - default: "v1.28.0" + default: "v1.29.0" description: 'CRICTL VERSION' - string: name: CRIO_VERSION - default: "v1.28.0" + default: "v1.29.0" description: 'CRI-O VERSION' properties: diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml index 3f13df27..ab525c53 100644 --- a/jjb/metal3/projects.yml +++ b/jjb/metal3/projects.yml @@ -277,6 +277,15 @@ - image_os: centos - capm3_e2e_k8s_upgrade_tests: 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 + target_branches: + - 'main' - 1-27-1-28: k8s_version_upgrade_from: v1.27.4 k8s_version_upgrade_to: v1.28.1 @@ -295,19 +304,10 @@ bmo_release_branch: main target_branches: - 'main' - - 1-25-1-26: - k8s_version_upgrade_from: v1.25.5 - k8s_version_upgrade_to: v1.26.4 - kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4 - 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 - kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1 + - 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.6 bmo_release_branch: release-0.5 capm3_target_branch: release-1-6 @@ -526,6 +526,15 @@ - image_os: centos - keep_capm3_e2e_k8s_upgrade_tests: 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 + target_branches: + - 'main' - 1-27-1-28: k8s_version_upgrade_from: v1.27.4 k8s_version_upgrade_to: v1.28.1 @@ -544,19 +553,10 @@ capm3_target_branch: main target_branches: - 'main' - - 1-25-1-26: - k8s_version_upgrade_from: v1.25.5 - k8s_version_upgrade_to: v1.26.4 - kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4 - 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 - kubectl_sha256: e7a7d6f9d06fab38b4128785aa80f65c54f6675a0d2abef655259ddd852274e1 # v1.28.1 + - 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.6 bmo_release_branch: release-0.5 capm3_target_branch: release-1-6 @@ -611,6 +611,15 @@ - image_os: centos - capm3_main_e2e_k8s_upgrade_tests: 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 + target_branches: + - 'main' - 1-27-1-28: k8s_version_upgrade_from: v1.27.4 k8s_version_upgrade_to: v1.28.1 @@ -627,17 +636,10 @@ capm3_release_branch: main bmo_release_branch: main capm3_target_branch: main - - 1-25-1-26: - k8s_version_upgrade_from: v1.25.5 - k8s_version_upgrade_to: v1.26.4 - kubectl_sha256: 636ac0eaa467dbceda4b2c4e33662adc9709f5ce40341c9fc1a687fc276ac02d # v1.26.4 - 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-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.6 bmo_release_branch: release-0.5 capm3_target_branch: release-1-6 -- 2.25.1