fix: multi-arch

Signed-off-by: Paul Bastide <[email protected]>

Author: prb112

Makefile

@@ -52,8 +52,8 @@ test-unit:
 
 test-integration:
 	mkdir -p tests/results-integration
-	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-additional.out -race -count=1 ./internal/pkg/... -run TestIntegrationAdditional
-	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-release.out -race -count=1 ./internal/pkg/... -run TestIntegrationRelease
+	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-additional.out -race -count=1 ./internal/pkg/... -run 'TestIntegrationAdditional$'
+	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-release.out -race -count=1 ./internal/pkg/... -run 'TestIntegrationRelease$'
 	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-additional.out -race -count=1 ./internal/pkg/... -run TestIntegrationAdditionalM2M
 	$(GO) test $(GO_MOD_FLAGS) $(GO_BUILD_FLAGS) -coverprofile=tests/results-integration/cover-release.out -race -count=1 ./internal/pkg/... -run TestIntegrationReleaseM2M
 	make -C v1 test-integration

internal/e2e/templates/isc_templates/release_isc.yaml

@@ -3,6 +3,10 @@ kind: ImageSetConfiguration
 apiVersion: mirror.openshift.io/v2alpha1
 mirror:
   platform:
+    architectures:
+      - "multi"
+      - "ppc64le"
+      - "amd64"
     channels:
     - name: {{.}} 
     graph: true

internal/testutils/testutils.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"runtime"
 	"strings"
 	"text/template"
 
@@ -23,6 +24,7 @@ import (
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/empty"
 	"github.com/google/go-containerregistry/pkg/v1/layout"
+	"github.com/google/go-containerregistry/pkg/v1/mutate"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
 	"github.com/openshift/oc-mirror/v2/internal/pkg/image"
 )
@@ -127,6 +129,17 @@ func buildAndPushFakeImage(content map[string][]byte, imgRef string, dir string)
 		return "", err
 	}
 	i, _ := crane.Image(content)
+	// Set the platform to match the local GOARCH
+	cfg, err := i.ConfigFile()
+	if err != nil {
+		return "", err
+	}
+	cfg.OS = runtime.GOOS
+	cfg.Architecture = runtime.GOARCH
+	i, err = mutate.ConfigFile(i, cfg)
+	if err != nil {
+		return "", err
+	}
 	if err := crane.Push(i, tag.String()); err != nil {
 		return "", err
 	}