Skip to content

Commit

Permalink
Merge pull request #29349 from openshift-bot/art-consistency-openshif…
Browse files Browse the repository at this point in the history
…t-4.19-openshift-enterprise-tests

OCPBUGS-45756: Updating openshift-enterprise-tests-container image to be consistent with ART for 4.19
  • Loading branch information
openshift-merge-bot[bot] authored Dec 19, 2024
2 parents e3f94ae + 97d20ab commit aa11e85
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.22-openshift-4.18
tag: rhel-9-release-golang-1.23-openshift-4.19
4 changes: 2 additions & 2 deletions images/tests/Dockerfile.rhel
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
WORKDIR /go/src/github.com/openshift/origin
COPY . .
RUN make; \
mkdir -p /tmp/build; \
cp /go/src/github.com/openshift/origin/openshift-tests /tmp/build/openshift-tests

FROM registry.ci.openshift.org/ocp/4.18:tools
FROM registry.ci.openshift.org/ocp/4.19:tools
COPY --from=builder /tmp/build/openshift-tests /usr/bin/
RUN mkdir -p /manifests
COPY --from=builder /go/src/github.com/openshift/origin/zz_generated.manifests/* /manifests
Expand Down

0 comments on commit aa11e85

Please sign in to comment.