Skip to content

Commit 420e6d0

Browse files
Merge pull request #1236 from DavidHurta/finalize-ote-integration-add-tests-binary-to-payload
OTA-1585: test: Include the compressed tests binary in the CVO container image
2 parents 667bc63 + 1fd1001 commit 420e6d0

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ WORKDIR /go/src/github.com/openshift/cluster-version-operator
33
COPY . .
44
RUN hack/build-go.sh; \
55
mkdir -p /tmp/build; \
6-
cp _output/linux/$(go env GOARCH)/cluster-version-operator /tmp/build/cluster-version-operator
6+
cp _output/linux/$(go env GOARCH)/cluster-version-operator _output/linux/$(go env GOARCH)/cluster-version-operator-tests.gz /tmp/build/
77

88
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
9-
COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
9+
COPY --from=builder /tmp/build/cluster-version-operator /tmp/build/cluster-version-operator-tests.gz /usr/bin/
1010
COPY install /manifests
1111
COPY vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/
1212
COPY vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/

Dockerfile.rhel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ WORKDIR /go/src/github.com/openshift/cluster-version-operator
33
COPY . .
44
RUN hack/build-go.sh; \
55
mkdir -p /tmp/build; \
6-
cp _output/linux/$(go env GOARCH)/cluster-version-operator /tmp/build/cluster-version-operator
6+
cp _output/linux/$(go env GOARCH)/cluster-version-operator _output/linux/$(go env GOARCH)/cluster-version-operator-tests.gz /tmp/build/
77

88
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
9-
COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
9+
COPY --from=builder /tmp/build/cluster-version-operator /tmp/build/cluster-version-operator-tests.gz /usr/bin/
1010
COPY install /manifests
1111
COPY vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/
1212
COPY vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/

0 commit comments

Comments
 (0)