From 76c5c770b21e101f00a32445d3e6fdc325d563b5 Mon Sep 17 00:00:00 2001 From: Brooks Newberry Date: Wed, 19 Mar 2025 23:40:28 -0700 Subject: [PATCH] Fix skew test for release candidates (#11972) Signed-off-by: Brooks Newberry --- tests/docker/skew/skew_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/docker/skew/skew_test.go b/tests/docker/skew/skew_test.go index 78b76026c87..6d3e4035430 100644 --- a/tests/docker/skew/skew_test.go +++ b/tests/docker/skew/skew_test.go @@ -62,12 +62,12 @@ var _ = Describe("Skew Tests", Ordered, func() { for _, server := range config.Servers { out, err := server.RunCmdOnNode("k3s --version") Expect(err).NotTo(HaveOccurred()) - // The k3s image is in the format rancher/k3s:v1.20.0-k3s1 + // The k3s image is in the format rancher/k3s:v1.20.0-k3s1 or rancher/k3s:v1.20.0-rc1-k3s1 cVersion := strings.Split(*k3sImage, ":")[1] cVersion = strings.Replace(cVersion, "-amd64", "", 1) cVersion = strings.Replace(cVersion, "-arm64", "", 1) cVersion = strings.Replace(cVersion, "-arm", "", 1) - cVersion = strings.Replace(cVersion, "-", "+", 1) + cVersion = strings.Replace(cVersion, "-k3s", "+k3s", 1) Expect(out).To(ContainSubstring(cVersion)) } for _, agent := range config.Agents { @@ -114,12 +114,12 @@ var _ = Describe("Skew Tests", Ordered, func() { for _, server := range config.Servers[1:] { out, err := server.RunCmdOnNode("k3s --version") Expect(err).NotTo(HaveOccurred()) - // The k3s image is in the format rancher/k3s:v1.20.0-k3s1-amd64 + // The k3s image is in the format rancher/k3s:v1.20.0-k3s1-amd64 or rancher/k3s:v1.20.0-rc1-k3s1-amd64 cVersion := strings.Split(*k3sImage, ":")[1] cVersion = strings.Replace(cVersion, "-amd64", "", 1) cVersion = strings.Replace(cVersion, "-arm64", "", 1) cVersion = strings.Replace(cVersion, "-arm", "", 1) - cVersion = strings.Replace(cVersion, "-", "+", 1) + cVersion = strings.Replace(cVersion, "-k3s", "+k3s", 1) Expect(out).To(ContainSubstring(cVersion)) } })