From c96ce9700f942cbd3446c55365f2b71f87e97b12 Mon Sep 17 00:00:00 2001 From: Petr Muller Date: Thu, 2 Dec 2021 23:00:48 +0100 Subject: [PATCH] Test custom machine-os-content image in machine-config-operator@mcbs 1. Import the custom image 2. "build" the machine-os-content from the custom image 3. Such "built" image gets picked up by the `include_built_images: true`-configured `latest` release that gets installed for testing 4. Make sure that `machine-os-content` will not be promoted (presubmits should forbid that but to be safe). --- .../openshift-machine-config-operator-mcbs.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-mcbs.yaml b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-mcbs.yaml index 605f3696dc7f3..89bcc79545bf2 100644 --- a/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-mcbs.yaml +++ b/ci-operator/config/openshift/machine-config-operator/openshift-machine-config-operator-mcbs.yaml @@ -7,6 +7,10 @@ base_images: name: builder namespace: ocp tag: rhel-8-golang-1.16-openshift-4.10 + walters_moc: + name: walters-rhcos-ostreecontainer-oldformat + namespace: coreos + tag: latest build_root: from_repository: true images: @@ -17,8 +21,13 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.10 to: machine-config-operator +- dockerfile_literal: FROM scratch + from: walters_moc + to: machine-os-content promotion: disabled: true + excluded_images: + - machine-os-content name: mcbs namespace: ocp releases: