diff --git a/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go b/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go index bf48e7e4b00f6..6f95429d1cf6b 100644 --- a/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go +++ b/openshift-hack/cmd/k8s-tests-ext/k8s-tests.go @@ -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? diff --git a/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmd.go b/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmd.go index 2db8cfa6eac39..03619bcbb606a 100644 --- a/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmd.go +++ b/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmd.go @@ -6,6 +6,7 @@ import ( "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/extension" @@ -19,5 +20,6 @@ func DefaultExtensionCommands(registry *extension.Registry) []*cobra.Command { cmdinfo.NewInfoCommand(registry), cmdupdate.NewUpdateCommand(registry), cmdimages.NewImagesCommand(registry), + cmdlistimages.NewListImagesCommand(registry), } } diff --git a/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdlistimages/cmdlistimages.go b/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdlistimages/cmdlistimages.go new file mode 100644 index 0000000000000..6b6db9e1a826a --- /dev/null +++ b/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/cmd/cmdlistimages/cmdlistimages.go @@ -0,0 +1,36 @@ +package cmdlistimages + +import ( + "encoding/json" + "fmt" + "os" + + "github.com/spf13/cobra" + + "github.com/openshift-eng/openshift-tests-extension/pkg/extension" + "github.com/openshift-eng/openshift-tests-extension/pkg/flags" +) + +func NewListImagesCommand(registry *extension.Registry) *cobra.Command { + componentFlags := flags.NewComponentFlags() + + cmd := &cobra.Command{ + Use: "list-images", + Short: "List test images", + SilenceUsage: true, + RunE: func(cmd *cobra.Command, args []string) error { + extension := registry.Get(componentFlags.Component) + if extension == nil { + return fmt.Errorf("couldn't find the component %q", componentFlags.Component) + } + images, err := json.Marshal(extension.TestImages) + if err != nil { + return err + } + fmt.Fprintf(os.Stdout, "%s\n", images) + return nil + }, + } + componentFlags.BindFlags(cmd.Flags()) + return cmd +} diff --git a/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/extension.go b/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/extension.go index d1c45762d0372..1ea408fe00601 100644 --- a/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/extension.go +++ b/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/extension.go @@ -22,6 +22,10 @@ func NewExtension(product, kind, name string) *Extension { Kind: kind, Name: name, }, + TestImages: map[string][]Image{ + "original": nil, + "mapped": nil, + }, } } @@ -124,8 +128,8 @@ func (e *Extension) AddSuite(suite Suite) *Extension { return e } -func (e *Extension) RegisterImage(image Image) *Extension { - e.Images = append(e.Images, image) +func (e *Extension) RegisterImage(key string, image Image) *Extension { + e.TestImages[key] = append(e.TestImages[key], image) return e } diff --git a/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/types.go b/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/types.go index 3b51674f4aa89..b917554031208 100644 --- a/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/types.go +++ b/vendor/github.com/openshift-eng/openshift-tests-extension/pkg/extension/types.go @@ -20,6 +20,8 @@ type Extension struct { Images []Image `json:"images"` + TestImages map[string][]Image `json:"test_images"` + // Private data specs extensiontests.ExtensionTestSpecs obsoleteTests sets.Set[string] diff --git a/vendor/modules.txt b/vendor/modules.txt index bbfbbb77ebd5d..2291c37600b53 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -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