Bump main and release-1.7 branch k8s tests to upgrade k8s to v1.30.0 from v1.29.0
Also remove oldest k8s upgrade test for main branch i.e. v1.26.x to v1.27.x
Signed-off-by: Kashif Khan <kashif.khan@est.tech>
Change-Id: Idf4dd692ac3bade980674511b863c9e57db360bf
Signed-off-by: Kashif Khan <kashif.khan@est.tech>
diff --git a/jjb/metal3/job_openstack_image_building.yml b/jjb/metal3/job_openstack_image_building.yml
index 7cad3c2..18e02ae 100644
--- a/jjb/metal3/job_openstack_image_building.yml
+++ b/jjb/metal3/job_openstack_image_building.yml
@@ -1,4 +1,3 @@
----
#
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
@@ -37,15 +36,15 @@
parameters:
- string:
name: KUBERNETES_VERSION
- default: "v1.29.0"
+ default: "v1.30.0"
description: 'Kubernetes version'
- string:
name: KUBECTL_SHA256
- default: '0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5' # v1.29.0
+ default: '7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5' # v1.30.0
description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION'
- string:
name: KIND_NODE_IMAGE_VERSION
- default: "v1.29.0"
+ default: "v1.29.2"
description: 'Kind node container image version'
properties:
@@ -61,7 +60,7 @@
url: "{ci_github_repo}"
credentials-id: "{ci_github_jenkins_credentials_id}"
branches:
- - 'main'
+ - 'main'
name: 'origin'
refspec: '+refs/heads/*:refs/remotes/origin/*'
wipe-workspace: True
diff --git a/jjb/metal3/job_openstack_node_image_building.yml b/jjb/metal3/job_openstack_node_image_building.yml
index f12d718..38f7835 100644
--- a/jjb/metal3/job_openstack_node_image_building.yml
+++ b/jjb/metal3/job_openstack_node_image_building.yml
@@ -1,4 +1,3 @@
----
#
# ============LICENSE_START=======================================================
# Copyright (C) 2019 Nordix Foundation.
@@ -37,19 +36,19 @@
parameters:
- string:
name: KUBERNETES_VERSION
- default: "v1.29.0"
+ default: "v1.30.0"
description: 'Kubernetes version'
- string:
name: KUBECTL_SHA256
- default: '0e03ab096163f61ab610b33f37f55709d3af8e16e4dcc1eb682882ef80f96fd5' # v1.29.0
+ default: '7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5' # v1.30.0
description: 'Kubectl SHA256 digest matching KUBERNETES_VERSION'
- string:
name: CRICTL_VERSION
- default: "v1.29.0"
+ default: "v1.30.0"
description: 'CRICTL VERSION'
- string:
name: CRIO_VERSION
- default: "v1.29.0"
+ default: "v1.29.3"
description: 'CRI-O VERSION'
properties:
@@ -65,14 +64,14 @@
url: "{ci_github_repo}"
credentials-id: "{ci_github_jenkins_credentials_id}"
branches:
- - 'main'
+ - 'main'
name: 'origin'
refspec: '+refs/heads/*:refs/remotes/origin/*'
wipe-workspace: True
honor-refspec: True
shallow-clone: False
included-regions:
- - "ci/images/.*"
- - "ci/scripts/image_scripts/.*"
+ - "ci/images/.*"
+ - "ci/scripts/image_scripts/.*"
script-path: 'ci/jobs/{id}.pipeline'
lightweight-checkout: False
diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index 8402afa..0ee4789 100644
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -311,6 +311,13 @@
- image_os: centos
- capm3_e2e_k8s_upgrade_tests_prow:
k8s_versions:
+ - 1-29-1-30:
+ k8s_version_upgrade_from: v1.29.0
+ k8s_version_upgrade_to: v1.30.0
+ kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
+ 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
@@ -325,17 +332,10 @@
capm3_release_branch: main
bmo_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
- kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
- 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
+ - 1-29-1-30:
+ k8s_version_upgrade_from: v1.29.0
+ k8s_version_upgrade_to: v1.30.0
+ kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
capm3_target_branch: release-1-7
@@ -373,6 +373,13 @@
- image_os: centos
- capm3_periodic_e2e_k8s_upgrade_tests_prow:
k8s_versions:
+ - 1-29-1-30:
+ k8s_version_upgrade_from: v1.29.0
+ k8s_version_upgrade_to: v1.30.0
+ kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
+ 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
@@ -387,17 +394,10 @@
capm3_release_branch: main
bmo_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
- kubectl_sha256: 4685bfcf732260f72fce58379e812e091557ef1dfc1bc8084226c7891dd6028f # v1.27.4
- 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
+ - 1-29-1-30:
+ k8s_version_upgrade_from: v1.29.0
+ k8s_version_upgrade_to: v1.30.0
+ kubectl_sha256: 7c3807c0f5c1b30110a2ff1e55da1d112a6d0096201f1beb81b269f582b5d1c5 # v1.30.0
capm3_release_branch: release-1.7
bmo_release_branch: release-0.6
capm3_target_branch: release-1-7