Skip to content

Commit ddc5201

Browse files
camilamacedo86tmshort
authored andcommitted
UPSTREAM: <carry>: [OTE]: Add binary in the operator controller image to allow proper integration with OCP tests
1 parent ed4e724 commit ddc5201

File tree

2 files changed

+10
-21
lines changed

2 files changed

+10
-21
lines changed

openshift/operator-controller.Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.20 AS builder
22
WORKDIR /build
33
COPY . .
4-
RUN make go-build-local
4+
RUN make go-build-local && \
5+
# Build the OLMv1 Test Extension binary.
6+
# This is used by openshift/origin to allow us to register the OLMv1 test extension
7+
# The binary needs to be added in the component image and OCP image
8+
cd openshift/tests-extension && \
9+
make build && \
10+
mkdir -p /tmp/build && \
11+
cp ./bin/olmv1-tests-ext /tmp/build/olmv1-tests-ext && \
12+
gzip -f /tmp/build/olmv1-tests-ext
513

614
FROM registry.ci.openshift.org/ocp/4.20:base-rhel9
715
USER 1001
816
COPY --from=builder /build/bin/operator-controller /operator-controller
17+
COPY --from=builder /tmp/build/olmv1-tests-ext.gz /usr/bin/olmv1-tests-ext.gz
918
COPY openshift/operator-controller/cp-manifests /cp-manifests
1019
COPY openshift/operator-controller/manifests /openshift/manifests
1120
COPY openshift/operator-controller/manifests-experimental /openshift/manifests-experimental

openshift/tests-extension/Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)