Skip to content

OCPBUGS-61465: Add a new field Mapped into openshift-test extension Image struct #2447

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
dinhxuanvu wants to merge 2 commits into
base: master
Choose a base branch
from
+50 −10
Open

OCPBUGS-61465: Add a new field Mapped into openshift-test extension Image struct #2447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6cb08a2
UPSTREAM: <drop>: Update openshift-tests-extension dependency
dinhxuanvu Nov 25, 2025
b22f2a0
UPSTREAM: <carry>: Add a new field Mapped into openshift-test extensi…
dinhxuanvu Nov 25, 2025
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ require (
github.com/opencontainers/cgroups v0.0.3
github.com/opencontainers/runc v1.2.5
github.com/opencontainers/selinux v1.11.1
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251104171704-4de6984a8e50
github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7
github.com/openshift/apiserver-library-go v0.0.0-20251015164739-79d04067059d
github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,8 +306,8 @@ github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE
github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/selinux v1.11.1 h1:nHFvthhM0qY8/m+vfhJylliSshm8G1jJ2jDMcgULaH8=
github.com/opencontainers/selinux v1.11.1/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835 h1:rkqIIfdYYkasXbF2XKVgh/3f1mhjSQK9By8WtVMgYo8=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251104171704-4de6984a8e50 h1:IDbKc3X/GwWtwDraBK+l0H0nUNcE3vU8BCba7HTo7/0=
github.com/openshift-eng/openshift-tests-extension v0.0.0-20251104171704-4de6984a8e50/go.mod h1:6gkP5f2HL0meusT0Aim8icAspcD1cG055xxBZ9yC68M=
github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7 h1:Ot2fbEEPmF3WlPQkyEW/bUCV38GMugH/UmZvxpWceNc=
github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7/go.mod h1:d5uzF0YN2nQQFA0jIEWzzOZ+edmo6wzlGLvx5Fhz4uY=
github.com/openshift/apiserver-library-go v0.0.0-20251015164739-79d04067059d h1:Mfya3RxHWvidOrKyHj3bmFn5x2B89DLZIvDAhwm+C2s=
Expand Down
18 changes: 13 additions & 5 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,9 +88,16 @@ func main() {
Qualifiers: []string{withExcludedTestsFilter(`name.contains('[Serial]')`)},
})

for k, v := range image.GetOriginalImageConfigs() {
image := convertToImage(v)
image.Index = int(k)
mirror := "quay.io/openshift/community-e2e-images"
if v := os.Getenv("TEST_IMAGE_MIRROR"); len(v) > 0 {
mirror = v
}
originals := image.GetOriginalImageConfigs()
mapped := image.GetMappedImageConfigs(originals, mirror)
for k, v := range originals {
image := convertToImage(v, int(k))
mappedImage := convertToImage(mapped[k], int(k))
image.Mapped = &mappedImage
kubeTestsExtension.RegisterImage(image)
}

Expand Down Expand Up @@ -158,10 +165,10 @@ func main() {
}
}

// convertToImages converts an image.Config to an extension.Image, which
// convertToImage converts an image.Config to an extension.Image, which
// can easily be serialized to JSON. Since image.Config has unexported fields,
// reflection is used to read its values.
func convertToImage(obj interface{}) e.Image {
func convertToImage(obj interface{}, index int) e.Image {
image := e.Image{}
val := reflect.ValueOf(obj)
typ := reflect.TypeOf(obj)
Expand All @@ -177,6 +184,7 @@ func convertToImage(obj interface{}) e.Image {
image.Version = fieldValue.String()
}
}
image.Index = index
return image
}

Expand Down
3 changes: 3 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.

31 changes: 30 additions & 1 deletion vendor/github.com/openshift-eng/openshift-tests-extension/pkg/ginkgo/util.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: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ github.com/opencontainers/runtime-spec/specs-go
github.com/opencontainers/selinux/go-selinux
github.com/opencontainers/selinux/go-selinux/label
github.com/opencontainers/selinux/pkg/pwalkdir
# github.com/openshift-eng/openshift-tests-extension v0.0.0-20250916161632-d81c09058835
# github.com/openshift-eng/openshift-tests-extension v0.0.0-20251104171704-4de6984a8e50
## explicit; go 1.23.0
github.com/openshift-eng/openshift-tests-extension/pkg/cmd
github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdimages
Expand Down