Skip to content

WIP: Fix missing k8s image #2442

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: Fix missing k8s image #2442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions openshift-hack/cmd/k8s-tests-ext/k8s-tests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,23 @@ func main() {
Qualifiers: []string{withExcludedTestsFilter(`name.contains('[Serial]')`)},
})

for k, v := range image.GetOriginalImageConfigs() {
originals := image.GetOriginalImageConfigs()
for k, v := range originals {
image := convertToImage(v)
image.Index = int(k)
kubeTestsExtension.RegisterImage(image)
kubeTestsExtension.RegisterImage("original", image)
}

mirror := "quay.io/openshift/community-e2e-images"
if v := os.Getenv("TEST_IMAGE_MIRROR"); len(v) > 0 {
mirror = v
}
mapped := image.GetMappedImageConfigs(originals, mirror)

for k, v := range mapped {
image := convertToImage(v)
image.Index = int(k)
kubeTestsExtension.RegisterImage("mapped", image)
}

//FIXME(stbenjam): what other suites does k8s-test contribute to?
Expand Down
2 changes: 2 additions & 0 deletions vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmd.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions ...github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdlistimages/cmdlistimages.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/extension.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/types.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ github.com/openshift-eng/openshift-tests-extension/pkg/cmd
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdimages
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdinfo
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdlist
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdlistimages
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdrun
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdupdate
github.com/openshift-eng/openshift-tests-extension/pkg/dbtime
Expand Down