Add a new field Mapped into openshift-test extension Image struct

The new field Mapped contains all the same fields of Image resource
that can be used later for openshift-tests images cmd to parse this
Mapped key. The k8s-tests-ext will construct this Mapped key from
GetMappedImageConfigs() function from upstream.

Signed-off-by: Vu Dinh <[email protected]>

Author: dinhxuanvu

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

@@ -88,12 +88,32 @@ func main() {
 		Qualifiers: []string{withExcludedTestsFilter(`name.contains('[Serial]')`)},
 	})
 
-	for k, v := range image.GetOriginalImageConfigs() {
+	originals := image.GetOriginalImageConfigs()
+	originalImages := make(map[int]e.Image)
+	for k, v := range originals {
 		image := convertToImage(v)
 		image.Index = int(k)
+		originalImages[image.Index] = image
 		kubeTestsExtension.RegisterImage(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 {
+		original, ok := originalImages[int(k)]
+		if !ok {
+			continue
+		}
+		image := convertToImage(v)
+		image.Index = int(k)
+		original.Mapped = &image
+		kubeTestsExtension.RegisterImage(original)
+	}
+
 	//FIXME(stbenjam): what other suites does k8s-test contribute to?
 
 	// Build our specs from ginkgo
@@ -158,7 +178,7 @@ 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 {