@@ -61,12 +61,12 @@ var _ = Describe("Skew Tests", Ordered, func() {
61
61
for _ , server := range config .Servers {
62
62
out , err := server .RunCmdOnNode ("k3s --version" )
63
63
Expect (err ).NotTo (HaveOccurred ())
64
- // The k3s image is in the format rancher/k3s:v1.20.0-k3s1
64
+ // The k3s image is in the format rancher/k3s:v1.20.0-k3s1 or rancher/k3s:v1.20.0-rc1-k3s1
65
65
cVersion := strings .Split (* k3sImage , ":" )[1 ]
66
66
cVersion = strings .Replace (cVersion , "-amd64" , "" , 1 )
67
67
cVersion = strings .Replace (cVersion , "-arm64" , "" , 1 )
68
68
cVersion = strings .Replace (cVersion , "-arm" , "" , 1 )
69
- cVersion = strings .Replace (cVersion , "-" , "+" , 1 )
69
+ cVersion = strings .Replace (cVersion , "-k3s " , "+k3s " , 1 )
70
70
Expect (out ).To (ContainSubstring (cVersion ))
71
71
}
72
72
for _ , agent := range config .Agents {
@@ -113,12 +113,12 @@ var _ = Describe("Skew Tests", Ordered, func() {
113
113
for _ , server := range config .Servers [1 :] {
114
114
out , err := server .RunCmdOnNode ("k3s --version" )
115
115
Expect (err ).NotTo (HaveOccurred ())
116
- // The k3s image is in the format rancher/k3s:v1.20.0-k3s1-amd64
116
+ // The k3s image is in the format rancher/k3s:v1.20.0-k3s1-amd64 or rancher/k3s:v1.20.0-rc1-k3s1-amd64
117
117
cVersion := strings .Split (* k3sImage , ":" )[1 ]
118
118
cVersion = strings .Replace (cVersion , "-amd64" , "" , 1 )
119
119
cVersion = strings .Replace (cVersion , "-arm64" , "" , 1 )
120
120
cVersion = strings .Replace (cVersion , "-arm" , "" , 1 )
121
- cVersion = strings .Replace (cVersion , "-" , "+" , 1 )
121
+ cVersion = strings .Replace (cVersion , "-k3s " , "+k3s " , 1 )
122
122
Expect (out ).To (ContainSubstring (cVersion ))
123
123
}
124
124
})
0 commit comments