Skip to content

K
k3s
Unverified Commit 76c5c770 authored by Brooks Newberry's avatar Brooks Newberry Committed by GitHub
Browse files
Options

Fix skew test for release candidates (#11972)

Signed-off-by: 's avatarBrooks Newberry <brooks@newberry.com>
parent 5e1845b7
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
tests/docker/skew/skew_test.go
View file @ 76c5c770
......@@ -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))
}
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment