Skip to content

Commit 5612dcc

Browse files
committed
test: Include compressed tests binary in CVO container image
To make the binary discoverable to the outside world. The following step is to register the binary in the origin repository to make the origin machine aware of the CVO tests extension.
1 parent 75c15b5 commit 5612dcc

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ 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 /tmp/build/cluster-version-operator; \
7+
cp _output/linux/$(go env GOARCH)/cluster-version-operator-tests.gz /tmp/build/cluster-version-operator-tests.gz
78

89
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest
910
COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
11+
COPY --from=builder /tmp/build/cluster-version-operator-tests.gz /usr/bin/
1012
COPY install /manifests
1113
COPY vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/
1214
COPY vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/

Dockerfile.rhel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@ 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 /tmp/build/cluster-version-operator; \
7+
cp _output/linux/$(go env GOARCH)/cluster-version-operator-tests.gz /tmp/build/cluster-version-operator-tests.gz
78

89
FROM registry.ci.openshift.org/ocp/4.21:base-rhel9
910
COPY --from=builder /tmp/build/cluster-version-operator /usr/bin/
11+
COPY --from=builder /tmp/build/cluster-version-operator-tests.gz /usr/bin/
1012
COPY install /manifests
1113
COPY vendor/github.com/openshift/api/config/v1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/
1214
COPY vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.crd-manifests/0000_00_cluster-version-operator_* /manifests/

0 commit comments

Comments
 (0)