Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
63 changes: 31 additions & 32 deletions tests/e2e/go.mod
Original file line number Diff line number Diff line change
@@ -1,26 +1,24 @@
module github.com/openshift/oc-mirror-tests-extension

go 1.24.6
go 1.25.0
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Read-only verification: find Go version pins/usages in repo config and docs.
set -euo pipefail

echo "== Files likely to pin Go versions =="
fd -HI '(^|/)(go\.mod|go\.work|\.tool-versions|\.go-version|Dockerfile|Dockerfile\..*|Makefile|README\.md|.*\.ya?ml)$'

echo
echo "== go.mod/go.work directives =="
rg -nP '^\s*go\s+[0-9]+\.[0-9]+(\.[0-9]+)?\s*$|^\s*toolchain\s+go[0-9]+\.[0-9]+(\.[0-9]+)?\s*$' --iglob 'go.mod' --iglob 'go.work'

echo
echo "== GitHub Actions setup-go pins =="
rg -nP 'setup-go|go-version|golang:' --iglob '*.yml' --iglob '*.yaml'

echo
echo "== Docker/Makefile/version strings referencing Go =="
rg -nP 'go1\.[0-9]+|golang:1\.[0-9]+|GO_VERSION|GOVERSION' --iglob 'Dockerfile*' --iglob 'Makefile' --iglob '*.mk' --iglob '*.yml' --iglob '*.yaml' --iglob '*.sh'

Repository: openshift/oc-mirror

Length of output: 22883


🏁 Script executed:

# Check GitHub Actions workflows
find .github/workflows -name '*.yml' -o -name '*.yaml' 2>/dev/null | head -20

Repository: openshift/oc-mirror

Length of output: 45


🏁 Script executed:

# Search for any go-version references in CI files
rg 'go-version|go_version|GOVERSION|GO_VERSION' --iglob '*.yml' --iglob '*.yaml' -A 2 -B 2

Repository: openshift/oc-mirror

Length of output: 45


🏁 Script executed:

# Check Dockerfiles for Go version pins
rg 'golang:|FROM.*go|GO_VERSION' --iglob 'Dockerfile*' -B 1 -A 1

Repository: openshift/oc-mirror

Length of output: 2165


🏁 Script executed:

# Check Makefile for Go-related targets
rg -n 'GO|go.*version' Makefile --iglob 'Makefile' --iglob '*.mk'

Repository: openshift/oc-mirror

Length of output: 2669


🏁 Script executed:

# List .github/workflows files
find .github/workflows -type f 2>/dev/null

Repository: openshift/oc-mirror

Length of output: 45


🏁 Script executed:

# Check if any workflow references tests/e2e or coordinates multi-module builds
rg 'tests/e2e|tests/integration|working-directory' .github/workflows/ -A 2 -B 2

Repository: openshift/oc-mirror

Length of output: 122


🏁 Script executed:

# Check .ci-operator.yaml to understand CI setup
cat -n .ci-operator.yaml | head -100

Repository: openshift/oc-mirror

Length of output: 197


🏁 Script executed:

# List all .yml/.yaml files in root to find CI config
fd -HI '\.(yml|yaml)$' . --maxdepth 1

Repository: openshift/oc-mirror

Length of output: 139


🏁 Script executed:

# Check if there's any CI documentation
find . -name 'CONTRIBUTING*' -o -name 'CI*' -o -name '*ci*' -type f -maxdepth 2 2>/dev/null | head -20

Repository: openshift/oc-mirror

Length of output: 121


Verify and align all Go module versions and Dockerfiles to 1.25 before merging.

CI's build root uses Go 1.25 (golang-1.25-openshift-4.22), but bumping tests/e2e to 1.25.0 while root go.mod remains at 1.24.3 creates version inconsistencies that will break builds. Additional mismatches found:

  • Root go.mod: 1.24.3 (conflicts with CI)
  • Root Dockerfile: 1.23.5 (severely outdated)
  • Dockerfile.tests-extension: 1.24 (incompatible with 1.25 modules)
  • v1/go.mod: 1.24.0
  • tests/integration/image-builders/release/go.mod: 1.23.0

tests/e2e/go.mod upgrade to 1.25.0 is correct, but the root module and build tooling must also be updated to 1.25 to maintain consistency with the CI environment. Without this, tests importing root modules will fail due to version mismatches.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@tests/e2e/go.mod` at line 3, Align all Go module and Docker base image
versions to 1.25: update the root go.mod "go" directive to 1.25 (matching the
tests/e2e change), and update the Go version tags in the project Dockerfile and
Dockerfile.tests-extension to the 1.25 base images; also bump the go directives
in v1/go.mod and tests/integration/image-builders/release/go.mod to 1.25, run go
mod tidy in each module and rebuild the test images to ensure no version
mismatches remain with the CI golang-1.25 environment.


require (
github.com/onsi/ginkgo/v2 v2.28.1
github.com/onsi/gomega v1.39.1
github.com/openshift-eng/openshift-tests-extension v0.0.0-20260127124016-0fed2b824818
github.com/openshift/api v0.0.0-20260114133223-6ab113cb7368
github.com/openshift/origin v1.5.0-alpha.3.0.20260319150657-3318a72fb0d6
github.com/spf13/cobra v1.10.1
github.com/tidwall/gjson v1.18.0
k8s.io/apimachinery v0.34.1
k8s.io/component-base v0.34.1
k8s.io/kubernetes v1.34.1
)

require (
cel.dev/expr v0.24.0 // indirect
cel.dev/expr v0.25.1 // indirect
cloud.google.com/go v0.121.6 // indirect
cloud.google.com/go/auth v0.16.5 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
cloud.google.com/go/compute/metadata v0.8.0 // indirect
cloud.google.com/go/compute/metadata v0.9.0 // indirect
cloud.google.com/go/iam v1.5.2 // indirect
cloud.google.com/go/monitoring v1.24.2 // indirect
cloud.google.com/go/storage v1.56.0 // indirect
Expand All @@ -47,7 +45,7 @@ require (
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
github.com/IBM-Cloud/power-go-client v1.12.0 // indirect
Expand All @@ -71,8 +69,8 @@ require (
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.2 // indirect
github.com/cloudflare/circl v1.6.0 // indirect
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
github.com/cloudflare/circl v1.6.3 // indirect
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
github.com/container-storage-interface/spec v1.9.0 // indirect
github.com/containerd/containerd/api v1.8.0 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
Expand All @@ -83,16 +81,16 @@ require (
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/coreos/stream-metadata-go v0.4.9 // indirect
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
github.com/cyphar/filepath-securejoin v0.5.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/dimchansky/utfbom v1.1.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v27.3.1+incompatible // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
github.com/euank/go-kmsg-parser v2.0.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/camelcase v1.0.0 // indirect
Expand All @@ -104,7 +102,7 @@ require (
github.com/gebn/bmc v0.0.0-20250519231546-bf709e03fe3c // indirect
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-jose/go-jose/v4 v4.1.1 // indirect
github.com/go-jose/go-jose/v4 v4.1.4 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/analysis v0.23.0 // indirect
Expand Down Expand Up @@ -142,7 +140,7 @@ require (
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.1 // indirect
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
Expand All @@ -166,7 +164,7 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/microsoft/kiota-abstractions-go v1.9.3 // indirect
github.com/microsoft/kiota-authentication-azure-go v1.3.0 // indirect
github.com/microsoft/kiota-http-go v1.5.2 // indirect
github.com/microsoft/kiota-http-go v1.5.5 // indirect
github.com/microsoft/kiota-serialization-form-go v1.1.2 // indirect
github.com/microsoft/kiota-serialization-json-go v1.1.2 // indirect
github.com/microsoft/kiota-serialization-multipart-go v1.1.2 // indirect
Expand All @@ -179,7 +177,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/spdystream v0.5.1 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/user v0.4.0 // indirect
Expand All @@ -197,7 +195,8 @@ require (
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/opencontainers/runc v1.2.5 // indirect
github.com/opencontainers/runtime-spec v1.2.0 // indirect
github.com/opencontainers/selinux v1.11.1 // indirect
github.com/opencontainers/selinux v1.14.1 // indirect
github.com/openshift/api v0.0.0-20260114133223-6ab113cb7368 // indirect
github.com/openshift/client-go v0.0.0-20260108185524-48f4ccfc4e13 // indirect
github.com/openshift/library-go v0.0.0-20251015151611-6fc7a74b67c5 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
Expand All @@ -215,36 +214,36 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/pflag v1.0.9 // indirect
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
github.com/std-uritemplate/std-uritemplate/go/v2 v2.0.3 // indirect
github.com/stoewer/go-strcase v1.3.1 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/stretchr/testify v1.11.1 // indirect
github.com/tecbiz-ch/nutanix-go-sdk v0.1.15 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.0 // indirect
github.com/vmware/govmomi v0.51.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xlab/treeprint v1.2.0 // indirect
github.com/zclconf/go-cty v1.16.2 // indirect
github.com/zeebo/errs v1.4.0 // indirect
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
go.mongodb.org/mongo-driver v1.17.3 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
go.opentelemetry.io/otel v1.37.0 // indirect
go.opentelemetry.io/otel v1.43.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
go.opentelemetry.io/otel/metric v1.37.0 // indirect
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.37.0 // indirect
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
go.opentelemetry.io/otel/metric v1.43.0 // indirect
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.43.0 // indirect
go.opentelemetry.io/otel/trace v1.43.0 // indirect
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
Expand All @@ -254,19 +253,19 @@ require (
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
golang.org/x/mod v0.32.0 // indirect
golang.org/x/net v0.49.0 // indirect
golang.org/x/oauth2 v0.30.0 // indirect
golang.org/x/oauth2 v0.34.0 // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.40.0 // indirect
golang.org/x/sys v0.42.0 // indirect
golang.org/x/term v0.39.0 // indirect
golang.org/x/text v0.33.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.41.0 // indirect
google.golang.org/api v0.247.0 // indirect
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1 // indirect
google.golang.org/grpc v1.75.1 // indirect
google.golang.org/protobuf v1.36.8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
google.golang.org/grpc v1.79.3 // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
Loading