From d7dcd5b24d52cf4a0d52b4c604a95ba465c88508 Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Thu, 3 Mar 2022 10:54:43 +0100 Subject: [PATCH] Try building OLM test image instead of using build-root --- .../openshift-operator-framework-olm-master.yaml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml index ab6bb988e1cd0..635c9b0e5c943 100755 --- a/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml +++ b/ci-operator/config/openshift/operator-framework-olm/openshift-operator-framework-olm-master.yaml @@ -24,9 +24,14 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.17-openshift-4.11 to: operator-registry +- dockerfile_path: base.Dockerfile + from: src + to: src-with-more-stuff promotion: name: "4.11" namespace: ocp + excluded_images: + - src-with-more-stuff releases: initial: integration: @@ -46,7 +51,7 @@ tests: - as: verify commands: make verify container: - from: src + from: src-with-more-stuff - as: e2e-gcp steps: cluster_profile: gcp @@ -60,15 +65,15 @@ tests: make unit/olm container: - from: src + from: src-with-more-stuff - as: unit-registry commands: make unit/registry container: - from: src + from: src-with-more-stuff - as: unit-api commands: make unit/api container: - from: src + from: src-with-more-stuff - as: e2e-aws-olm steps: cluster_profile: aws @@ -76,7 +81,7 @@ tests: - as: test cli: latest commands: JUNIT_DIRECTORY=${ARTIFACT_DIR} make e2e/olm - from: src + from: src-with-more-stuff resources: requests: cpu: 100m