Updated openshift-tests images to utilize mapped images from external binary

Currently, openshift-tests images cmd uses vendored GetMappedImageConfigs()
function to map upstream images to mirrored ones. After this change, images
cmd will parsed mapped images directly from outputs from the k8s-tests-ext
binary. This prevents unexpected issues from imcompatible upstreams changes
with vendored funcs.

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

Author: dinhxuanvu

pkg/cmd/openshift-tests/images/images_command.go

@@ -113,37 +113,35 @@ type imagesOptions struct {
 func createImageMirrorForInternalImages(prefix string, ref reference.DockerImageReference, mirrored bool) ([]string, error) {
 	source := ref.Exact()
 
-	initialImageSets := []extensions.ImageSet{
+	originalImageSets := []extensions.ImageSet{
 		k8simage.GetOriginalImageConfigs(),
 	}
-
-	// If ENV is not set, the list of images should come from external binaries
-	if len(os.Getenv("OPENSHIFT_SKIP_EXTERNAL_TESTS")) == 0 {
-		// Extract all test binaries
-		extractionContext, extractionContextCancel := context.WithTimeout(context.Background(), 30*time.Minute)
-		defer extractionContextCancel()
-		cleanUpFn, externalBinaries, err := extensions.ExtractAllTestBinaries(extractionContext, 10)
-		if err != nil {
-			return nil, err
-		}
-		defer cleanUpFn()
-
-		// List test images from all available binaries
-		listContext, listContextCancel := context.WithTimeout(context.Background(), time.Minute)
-		defer listContextCancel()
-		imageSetsFromBinaries, err := externalBinaries.ListImages(listContext, 10)
-		if err != nil {
-			return nil, err
-		}
-		if len(imageSetsFromBinaries) == 0 {
-			return nil, fmt.Errorf("no test images were reported by external binaries")
-		}
-		initialImageSets = imageSetsFromBinaries
+	initialImageSets := []extensions.ImageSet{}
+
+	// Extract all test binaries
+	extractionContext, extractionContextCancel := context.WithTimeout(context.Background(), 30*time.Minute)
+	defer extractionContextCancel()
+	cleanUpFn, externalBinaries, err := extensions.ExtractAllTestBinaries(extractionContext, 10)
+	if err != nil {
+		return nil, err
 	}
+	defer cleanUpFn()
+
+	// List test images from all available binaries
+	listContext, listContextCancel := context.WithTimeout(context.Background(), time.Minute)
+	defer listContextCancel()
+	imageSetsFromBinaries, err := externalBinaries.ListImages(listContext, 10)
+	if err != nil {
+		return nil, err
+	}
+	if len(imageSetsFromBinaries) == 0 {
+		return nil, fmt.Errorf("no test images were reported by external binaries")
+	}
+	initialImageSets = imageSetsFromBinaries
 
 	// Take the initial images coming from external binaries and remove any exceptions that might exist.
 	exceptions := image.Exceptions.List()
-	defaultImageSets := []extensions.ImageSet{}
+	updatedImageSets := []extensions.ImageSet{}
 	for i := range initialImageSets {
 		filtered := extensions.ImageSet{}
 		for imageID, imageConfig := range initialImageSets[i] {
@@ -154,16 +152,10 @@ func createImageMirrorForInternalImages(prefix string, ref reference.DockerImage
 			}
 		}
 		if len(filtered) > 0 {
-			defaultImageSets = append(defaultImageSets, filtered)
+			updatedImageSets = append(updatedImageSets, filtered)
 		}
 	}
 
-	// Created a new slice with the updatedImageSets addresses for the images
-	updatedImageSets := []extensions.ImageSet{}
-	for i := range defaultImageSets {
-		updatedImageSets = append(updatedImageSets, k8simage.GetMappedImageConfigs(defaultImageSets[i], ref.Exact()))
-	}
-
 	openshiftDefaults := image.OriginalImages()
 	openshiftUpdated := image.GetMappedImages(openshiftDefaults, imagesetup.DefaultTestImageMirrorLocation)
 
@@ -178,9 +170,9 @@ func createImageMirrorForInternalImages(prefix string, ref reference.DockerImage
 		covered := sets.NewString()
 		for i := range updatedImageSets {
 			for imageID, imageConfig := range updatedImageSets[i] {
-				defaultConfig := defaultImageSets[i][imageID]
+				originalConfig := originalImageSets[i][imageID]
 				pullSpec := imageConfig.GetE2EImage()
-				if pullSpec == defaultConfig.GetE2EImage() {
+				if pullSpec == originalConfig.GetE2EImage() {
 					continue
 				}
 				if covered.Has(pullSpec) {
@@ -197,7 +189,7 @@ func createImageMirrorForInternalImages(prefix string, ref reference.DockerImage
 				imageConfig.SetRegistry(baseRef.Registry)
 				imageConfig.SetName(baseRef.RepositoryName())
 				imageConfig.SetVersion(e2eRef.Tag)
-				defaultImageSets[i][imageID] = imageConfig
+				originalImageSets[i][imageID] = imageConfig
 			}
 		}
 
@@ -223,7 +215,7 @@ func createImageMirrorForInternalImages(prefix string, ref reference.DockerImage
 	var lines []string
 	for i := range updatedImageSets {
 		for imageID := range updatedImageSets[i] {
-			a, b := defaultImageSets[i][imageID], updatedImageSets[i][imageID]
+			a, b := originalImageSets[i][imageID], updatedImageSets[i][imageID]
 			from, to := a.GetE2EImage(), b.GetE2EImage()
 			if from == to {
 				continue

pkg/test/extensions/binary.go

@@ -408,19 +408,21 @@ func (b *TestBinary) ListImages(ctx context.Context) (ImageSet, error) {
 		return nil, fmt.Errorf("failed running '%s list': %w\nOutput: %s", b.binaryPath, err, output)
 	}
 
-	var images []Image
+	var images []extension.Image
 	err = json.Unmarshal(output, &images)
 	if err != nil {
 		return nil, err
 	}
 
 	result := make(ImageSet, len(images))
 	for _, image := range images {
-		imageConfig := k8simage.Config{}
-		imageConfig.SetName(image.Name)
-		imageConfig.SetVersion(image.Version)
-		imageConfig.SetRegistry(image.Registry)
-		result[k8simage.ImageID(image.Index)] = imageConfig
+		if image.Mapped != nil {
+			imageConfig := k8simage.Config{}
+			imageConfig.SetName(image.Mapped.Name)
+			imageConfig.SetVersion(image.Mapped.Version)
+			imageConfig.SetRegistry(image.Mapped.Registry)
+			result[k8simage.ImageID(image.Mapped.Index)] = imageConfig
+		}
 	}
 
 	logrus.Infof("Listed %d test images for %q in %v", len(images), binName, time.Since(start))