Skip to content

Commit c419de9

Browse files
committed
wip
1 parent a237dcb commit c419de9

File tree

6 files changed

+62
-4
lines changed

6 files changed

+62
-4
lines changed

openshift-hack/cmd/k8s-tests-ext/k8s-tests.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,23 @@ func main() {
8888
Qualifiers: []string{withExcludedTestsFilter(`name.contains('[Serial]')`)},
8989
})
9090

91-
for k, v := range image.GetOriginalImageConfigs() {
91+
originals := image.GetOriginalImageConfigs()
92+
for k, v := range originals {
9293
image := convertToImage(v)
9394
image.Index = int(k)
94-
kubeTestsExtension.RegisterImage(image)
95+
kubeTestsExtension.RegisterImage("original", image)
96+
}
97+
98+
mirror := "quay.io/openshift/community-e2e-images"
99+
if v := os.Getenv("TEST_IMAGE_MIRROR"); len(v) > 0 {
100+
mirror = v
101+
}
102+
mapped := image.GetMappedImageConfigs(originals, mirror)
103+
104+
for k, v := range mapped {
105+
image := convertToImage(v)
106+
image.Index = int(k)
107+
kubeTestsExtension.RegisterImage("mapped", image)
95108
}
96109

97110
//FIXME(stbenjam): what other suites does k8s-test contribute to?

vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmd.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdlistimages/cmdlistimages.go

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/extension.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/types.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ github.com/openshift-eng/openshift-tests-extension/pkg/cmd
508508
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdimages
509509
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdinfo
510510
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdlist
511+
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdlistimages
511512
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdrun
512513
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdupdate
513514
github.com/openshift-eng/openshift-tests-extension/pkg/dbtime

0 commit comments

Comments
 (0)