Skip to content

NO-ISSUE: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345) #347

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

Merged
openshift-merge-bot merged 1 commit into from
May 19, 2025
Merged

NO-ISSUE: <carry>: [DefaultCatalogTests]: Moving parse of ENVVAR to the caller (follow-up 345) #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 1 addition & 22 deletions openshift/default-catalog-consistency/pkg/extract/extract.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func (r *ExtractedImage) Cleanup() {
}

// UnpackImage pulls the image, extracts it to disk, and opens it as an OCI store.
func UnpackImage(ctx context.Context, imageRef, name string) (res *ExtractedImage, err error) {
func UnpackImage(ctx context.Context, imageRef, name string, sysCtx *types.SystemContext) (res *ExtractedImage, err error) {
tmpDir, err := os.MkdirTemp("", fmt.Sprintf("oci-%s-", name))
if err != nil {
return nil, fmt.Errorf("create temp dir: %w", err)
Expand All @@ -53,27 +53,6 @@ func UnpackImage(ctx context.Context, imageRef, name string) (res *ExtractedImag
return nil, fmt.Errorf("parse image ref: %w", err)
}

// Force image resolution to Linux to avoid OS mismatch errors on macOS,
// like: "no image found for architecture 'arm64', OS 'darwin'".
//
// Setting OSChoice = "linux" ensures we always get a Linux image,
// even when running on macOS.
//
// This skips the full multi-arch index and gives us just one manifest.
// To check all supported architectures (e.g., amd64, arm64, ppc64le, s390x),
// we’d need to avoid setting OSChoice and inspect the full index manually.
//
// TODO: Update this to support checking all architectures.
// See: https://issues.redhat.com/browse/OPRUN-3793
sysCtx := &types.SystemContext{
OSChoice: "linux",
}

if authPath := os.Getenv("REGISTRY_AUTH_FILE"); authPath != "" {
fmt.Println("Using registry auth file:", authPath)
sysCtx.AuthFilePath = authPath
}

policyCtx, err := loadPolicyContext(sysCtx, imageRef)
if err != nil {
return nil, fmt.Errorf("create policy context: %w", err)
Expand Down
25 changes: 24 additions & 1 deletion openshift/default-catalog-consistency/test/validate/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package validate
import (
"context"
"fmt"
"github.com/containers/image/v5/types"
"os"
"testing"

. "github.com/onsi/ginkgo/v2"
Expand All @@ -23,6 +25,27 @@ var _ = Describe("Check Catalog Consistency", func() {
images, err := utils.ParseImageRefsFromCatalog(catalogsPath)
Expect(err).ToNot(HaveOccurred())
Expect(images).ToNot(BeEmpty(), "no images found")
authPath := os.Getenv("REGISTRY_AUTH_FILE")

// Force image resolution to Linux to avoid OS mismatch errors on macOS,
// like: "no image found for architecture 'arm64', OS 'darwin'".
//
// Setting OSChoice = "linux" ensures we always get a Linux image,
// even when running on macOS.
//
// This skips the full multi-arch index and gives us just one manifest.
// To check all supported architectures (e.g., amd64, arm64, ppc64le, s390x),
// we’d need to avoid setting OSChoice and inspect the full index manually.
//
// TODO: Update this to support checking all architectures.
// See: https://issues.redhat.com/browse/OPRUN-3793
sysCtx := &types.SystemContext{
OSChoice: "linux",
}
if authPath != "" {
fmt.Println("Using registry auth file:", authPath)
sysCtx.AuthFilePath = authPath
}

for _, url := range images {
name := utils.ImageNameFromRef(url)
Expand All @@ -31,7 +54,7 @@ var _ = Describe("Check Catalog Consistency", func() {
ctx := context.Background()
By(fmt.Sprintf("Validating image: %s", url))

extractedImage, err := extract.UnpackImage(ctx, url, name)
extractedImage, err := extract.UnpackImage(ctx, url, name, sysCtx)
Expect(err).ToNot(HaveOccurred())
Expect(check.Check(ctx, extractedImage, check.AllChecks())).To(Succeed())
extractedImage.Cleanup()
Expand Down