From 21ac484dcafd5a0230a5692a6b0819d9638fa9be Mon Sep 17 00:00:00 2001 From: Roger Yao Date: Mon, 25 Nov 2024 16:57:36 +0800 Subject: [PATCH 1/2] ci: Upgrade tests support rke2/k3s v1.30.6 Signed-off-by: Roger Yao --- .../master/sles/longhorn-upgrade-tests-sles-amd64.yml | 6 +++--- .../master/sles/longhorn-upgrade-tests-sles-arm64.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jenkins-jobs/master/sles/longhorn-upgrade-tests-sles-amd64.yml b/jenkins-jobs/master/sles/longhorn-upgrade-tests-sles-amd64.yml index 9551406..5d4dbef 100644 --- a/jenkins-jobs/master/sles/longhorn-upgrade-tests-sles-amd64.yml +++ b/jenkins-jobs/master/sles/longhorn-upgrade-tests-sles-amd64.yml @@ -88,11 +88,11 @@ description: "kubernetes distro version to install [rke2, k3s] (default: k3s)" - string: name: K8S_DISTRO_VERSION - default: "v1.31.1+k3s1" + default: "v1.30.6+k3s1" description: | kubernetes version that will be deployed - for rke2: (default: v1.31.1+rke2r1) - for k3s: (default: v1.31.1+k3s1) + for rke2: (default: v1.30.6+rke2r1) + for k3s: (default: v1.30.6+k3s1) - string: name: DISTRO default: "sles" diff --git a/jenkins-jobs/master/sles/longhorn-upgrade-tests-sles-arm64.yml b/jenkins-jobs/master/sles/longhorn-upgrade-tests-sles-arm64.yml index 6941388..4059700 100644 --- a/jenkins-jobs/master/sles/longhorn-upgrade-tests-sles-arm64.yml +++ b/jenkins-jobs/master/sles/longhorn-upgrade-tests-sles-arm64.yml @@ -88,11 +88,11 @@ description: "kubernetes distro version to install [rke2, k3s] (default: k3s)" - string: name: K8S_DISTRO_VERSION - default: "v1.31.1+k3s1" + default: "v1.30.6+k3s1" description: | kubernetes version that will be deployed - for rke2: (default: v1.31.1+rke2r1) - for k3s: (default: v1.31.1+k3s1) + for rke2: (default: v1.30.6+rke2r1) + for k3s: (default: v1.30.6+k3s1) - string: name: DISTRO default: "sles" From 544492b2b7885c328cf441777d5e295c20ae1ba1 Mon Sep 17 00:00:00 2001 From: Roger Yao Date: Mon, 25 Nov 2024 17:02:54 +0800 Subject: [PATCH 2/2] ci: 2-stage upgrade tests support rke2/k3s v1.29.10 Signed-off-by: Roger Yao --- .../sles/longhorn-2-stage-upgrade-tests-sles-amd64.yml | 6 +++--- .../sles/longhorn-2-stage-upgrade-tests-sles-arm64.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jenkins-jobs/master/sles/longhorn-2-stage-upgrade-tests-sles-amd64.yml b/jenkins-jobs/master/sles/longhorn-2-stage-upgrade-tests-sles-amd64.yml index 0280f74..3f2a5b0 100644 --- a/jenkins-jobs/master/sles/longhorn-2-stage-upgrade-tests-sles-amd64.yml +++ b/jenkins-jobs/master/sles/longhorn-2-stage-upgrade-tests-sles-amd64.yml @@ -92,11 +92,11 @@ description: "kubernetes distro version to install [rke2, k3s] (default: k3s)" - string: name: K8S_DISTRO_VERSION - default: "v1.31.1+k3s1" + default: "v1.29.10+k3s1" description: | kubernetes version that will be deployed - for rke2: (default: v1.31.1+rke2r1) - for k3s: (default: v1.31.1+k3s1) + for rke2: (default: v1.29.10+rke2r1) + for k3s: (default: v1.29.10+k3s1) - string: name: DISTRO default: "sles" diff --git a/jenkins-jobs/master/sles/longhorn-2-stage-upgrade-tests-sles-arm64.yml b/jenkins-jobs/master/sles/longhorn-2-stage-upgrade-tests-sles-arm64.yml index 222dcf0..07bd6d8 100644 --- a/jenkins-jobs/master/sles/longhorn-2-stage-upgrade-tests-sles-arm64.yml +++ b/jenkins-jobs/master/sles/longhorn-2-stage-upgrade-tests-sles-arm64.yml @@ -92,11 +92,11 @@ description: "kubernetes distro version to install [rke2, k3s] (default: k3s)" - string: name: K8S_DISTRO_VERSION - default: "v1.31.1+k3s1" + default: "v1.29.10+k3s1" description: | kubernetes version that will be deployed - for rke2: (default: v1.31.1+rke2r1) - for k3s: (default: v1.31.1+k3s1) + for rke2: (default: v1.29.10+rke2r1) + for k3s: (default: v1.29.10+k3s1) - string: name: DISTRO default: "sles"