Skip to content

Commit 0cd715f

Browse files
authored
Merge pull request #1505 from FloatXD/e2e-up-17
[Test]upgrade k8s version in e2e test
2 parents dd73880 + 4bd21f5 commit 0cd715f

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

hack/run-nightly-cluster-e2e.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,20 +146,20 @@ func_prepare_config_yaml "${SOURCE_CONFIG_PATH}" "${dest_config_path}"
146146
CLUSTER_OPERATION_NAME1="cluster1-install-"`date "+%H-%M-%S"`
147147

148148
# set vars-conf-cm.yml
149-
sed -i "s/v1.31.6/v1.30.0/" "${dest_config_path}"/vars-conf-cm.yml
149+
sed -i "s/v1.31.6/v1.30.7/" "${dest_config_path}"/vars-conf-cm.yml
150150

151151
sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME1}/" "${dest_config_path}"/kubeanClusterOps.yml
152152

153153

154-
## prepare cluster upgrade job yml --> upgrade from v1.30.0 to v1.31.0
154+
## prepare cluster upgrade job yml --> upgrade from v1.30.7 to v1.31.2
155155
dest_config_path="${REPO_ROOT}"/test/kubean_sonobouy_nightlye2e/e2e-upgrade-cluster-y/
156156
func_prepare_config_yaml "${SOURCE_CONFIG_PATH}" "${dest_config_path}"
157157
CLUSTER_OPERATION_NAME2="cluster1-upgrade-y"
158158
sed -i "s/e2e-cluster1-install/${CLUSTER_OPERATION_NAME2}/" "${dest_config_path}"/kubeanClusterOps.yml
159159
sed -i "s/cluster.yml/upgrade-cluster.yml/" "${dest_config_path}"/kubeanClusterOps.yml
160-
sed -i "s/v1.31.6/v1.31.0/" "${dest_config_path}"/vars-conf-cm.yml
160+
sed -i "s/v1.31.6/v1.31.2/" "${dest_config_path}"/vars-conf-cm.yml
161161

162-
## prepare cluster upgrade job yml --> upgrade from v1.31.0 to v1.31.6
162+
## prepare cluster upgrade job yml --> upgrade from v1.31.2 to v1.31.6
163163
dest_config_path="${REPO_ROOT}"/test/kubean_sonobouy_nightlye2e/e2e-upgrade-cluster-z/
164164
func_prepare_config_yaml "${SOURCE_CONFIG_PATH}" "${dest_config_path}"
165165
CLUSTER_OPERATION_NAME3="cluster1-upgrade-z"

test/tools/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ const (
3232
)
3333

3434
const (
35-
OriginK8Version = "v1.30.0"
36-
UpgradeK8Version_Y = "v1.31.0"
35+
OriginK8Version = "v1.30.7"
36+
UpgradeK8Version_Y = "v1.31.2"
3737
UpgradeK8Version_Z = "v1.31.6"
3838
NginxAlpha = "release-ci.daocloud.io/kubean/nginx:alpine"
3939
E2eInstallClusterYamlFolder = "e2e-install-cluster"

0 commit comments

Comments
 (0)