Skip to content

Commit 68d2f9c

Browse files
committed
use same registry for compliant and non-compliant images
1 parent 0a34ba7 commit 68d2f9c

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

test/e2e/apiserver.go

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ import (
3939
)
4040

4141
const (
42-
compliantImage1 = "container-registry.zalando.net/teapot/skipper:v0.21.0" // these are several compliant images
42+
// these are several compliant images
43+
compliantImage1 = "container-registry.zalando.net/teapot/skipper:v0.21.0"
4344
compliantImage2 = "container-registry.zalando.net/teapot/skipper:v0.21.1"
4445
compliantImage3 = "container-registry.zalando.net/teapot/skipper:v0.21.2"
4546
compliantImage4 = "container-registry.zalando.net/teapot/skipper:v0.21.3"
@@ -49,16 +50,16 @@ const (
4950
compliantImage8 = "container-registry.zalando.net/teapot/skipper:v0.21.7"
5051

5152
// these are non-compliant because of expired base image
52-
nonCompliantImage1 = "registry.opensource.zalan.do/teapot/skipper:v0.14.0"
53-
nonCompliantImage2 = "registry.opensource.zalan.do/teapot/skipper:v0.14.1"
54-
nonCompliantImage3 = "registry.opensource.zalan.do/teapot/skipper:v0.14.2"
55-
nonCompliantImage4 = "registry.opensource.zalan.do/teapot/skipper:v0.14.3"
56-
nonCompliantImage5 = "registry.opensource.zalan.do/teapot/skipper:v0.14.4"
57-
nonCompliantImage6 = "registry.opensource.zalan.do/teapot/skipper:v0.14.5"
58-
nonCompliantImage7 = "registry.opensource.zalan.do/teapot/skipper:v0.14.6"
59-
nonCompliantImage8 = "registry.opensource.zalan.do/teapot/skipper:v0.14.7"
60-
nonCompliantImage9 = "registry.opensource.zalan.do/teapot/skipper:v0.14.8"
61-
nonCompliantImage10 = "registry.opensource.zalan.do/teapot/skipper:v0.14.9"
53+
nonCompliantImage1 = "container-registry.zalando.net/teapot/skipper:v0.19.0"
54+
nonCompliantImage2 = "container-registry.zalando.net/teapot/skipper:v0.19.1"
55+
nonCompliantImage3 = "container-registry.zalando.net/teapot/skipper:v0.19.2"
56+
nonCompliantImage4 = "container-registry.zalando.net/teapot/skipper:v0.19.3"
57+
nonCompliantImage5 = "container-registry.zalando.net/teapot/skipper:v0.19.4"
58+
nonCompliantImage6 = "container-registry.zalando.net/teapot/skipper:v0.19.5"
59+
nonCompliantImage7 = "container-registry.zalando.net/teapot/skipper:v0.19.6"
60+
nonCompliantImage8 = "container-registry.zalando.net/teapot/skipper:v0.19.7"
61+
nonCompliantImage9 = "container-registry.zalando.net/teapot/skipper:v0.19.8"
62+
nonCompliantImage10 = "container-registry.zalando.net/teapot/skipper:v0.19.9"
6263
waitForPodTimeout = 5 * time.Minute
6364
)
6465

0 commit comments

Comments
 (0)