Merge "Bump k8s to v1.28.1. Also bump crictl, crio and kind node image to v1.28.0. For main branch k8s upgrade tests we add v1.27.x to v1.28.x test and remove the v1.24.x-1.25.x test."
diff --git a/jjb/metal3/job_openstack_image_building.yml b/jjb/metal3/job_openstack_image_building.yml
index 4a2af8e..aadee7f 100644
--- a/jjb/metal3/job_openstack_image_building.yml
+++ b/jjb/metal3/job_openstack_image_building.yml
@@ -35,11 +35,11 @@
parameters:
- string:
name: KUBERNETES_VERSION
- default: "v1.27.4"
+ default: "v1.28.1"
description: 'Kubernetes version'
- string:
name: KIND_NODE_IMAGE_VERSION
- default: "v1.27.3"
+ default: "v1.28.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 91af563..819624e 100644
--- a/jjb/metal3/job_openstack_node_image_building.yml
+++ b/jjb/metal3/job_openstack_node_image_building.yml
@@ -35,15 +35,15 @@
parameters:
- string:
name: KUBERNETES_VERSION
- default: "v1.27.4"
+ default: "v1.28.1"
description: 'Kubernetes version'
- string:
name: CRICTL_VERSION
- default: "v1.27.1"
+ default: "v1.28.0"
description: 'CRICTL VERSION'
- string:
name: CRIO_VERSION
- default: "v1.27.1"
+ default: "v1.28.0"
description: 'CRI-O VERSION'
properties:
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index e7f303b..a1ffea8 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -256,6 +256,13 @@
- image_os: centos
- capm3_e2e_k8s_upgrade_tests:
k8s_versions:
+ - 1-27-1-28:
+ k8s_version_upgrade_from: v1.27.4
+ k8s_version_upgrade_to: v1.28.1
+ capm3_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
@@ -270,13 +277,6 @@
capm3_target_branch: main
target_branches:
- 'main'
- - 1-24-1-25:
- k8s_version_upgrade_from: v1.24.9
- k8s_version_upgrade_to: v1.25.5
- capm3_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
@@ -426,6 +426,13 @@
- image_os: centos
- keep_capm3_e2e_k8s_upgrade_tests:
k8s_versions:
+ - 1-27-1-28:
+ k8s_version_upgrade_from: v1.27.4
+ k8s_version_upgrade_to: v1.28.1
+ capm3_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
@@ -440,13 +447,6 @@
capm3_target_branch: main
target_branches:
- 'main'
- - 1-24-1-25:
- k8s_version_upgrade_from: v1.24.9
- k8s_version_upgrade_to: v1.25.5
- capm3_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
@@ -494,6 +494,13 @@
- image_os: centos
- capm3_main_e2e_k8s_upgrade_tests:
k8s_versions:
+ - 1-27-1-28:
+ k8s_version_upgrade_from: v1.27.4
+ k8s_version_upgrade_to: v1.28.1
+ capm3_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
@@ -504,11 +511,6 @@
k8s_version_upgrade_to: v1.26.4
capm3_release_branch: main
capm3_target_branch: main
- - 1-24-1-25:
- k8s_version_upgrade_from: v1.24.9
- k8s_version_upgrade_to: v1.25.5
- capm3_release_branch: main
- capm3_target_branch: main
- 1-26-1-27:
k8s_version_upgrade_from: v1.26.4
k8s_version_upgrade_to: v1.27.4