From 4dc1c8cafed21453e807a4dcc0dcbb2a11e41748 Mon Sep 17 00:00:00 2001 From: Andrea Fasano Date: Tue, 31 Oct 2023 16:50:02 +0100 Subject: [PATCH] revert installer image to origin stream for OKD variant --- .../openshift-machine-os-images-main__okd-scos.yaml | 6 +++--- .../openshift-machine-os-images-main__okd.yaml | 6 +++--- .../openshift-machine-os-images-release-4.15__okd-scos.yaml | 4 ++-- .../openshift-machine-os-images-release-4.15__okd.yaml | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd-scos.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd-scos.yaml index 5d3dfa29d3283..89c6e05b8a5a3 100644 --- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd-scos.yaml +++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd-scos.yaml @@ -3,9 +3,9 @@ base_images: name: "4.15" namespace: origin tag: base - ocp_4.15_installer: + origin_4.15_installer: name: "4.15" - namespace: ocp + namespace: origin tag: installer build_root: from_repository: true @@ -16,7 +16,7 @@ images: dockerfile_path: Dockerfile from: base inputs: - ocp_4.15_installer: + origin_4.15_installer: as: - registry.ci.openshift.org/ocp/4.15:installer to: machine-os-images diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml index ddc303c932521..a384d41d68694 100644 --- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml +++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-main__okd.yaml @@ -3,9 +3,9 @@ base_images: name: "4.15" namespace: origin tag: base - ocp_4.15_installer: + origin_4.15_installer: name: "4.15" - namespace: ocp + namespace: origin tag: installer build_root: from_repository: true @@ -16,7 +16,7 @@ images: dockerfile_path: Dockerfile from: base inputs: - ocp_4.15_installer: + origin_4.15_installer: as: - registry.ci.openshift.org/ocp/4.15:installer to: machine-os-images diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd-scos.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd-scos.yaml index a93779b2b30aa..01a9b46b684e5 100644 --- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd-scos.yaml +++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd-scos.yaml @@ -3,7 +3,7 @@ base_images: name: "4.15" namespace: origin tag: base - ocp_4.15_installer: + origin_4.15_installer: name: "4.15" namespace: ocp tag: installer @@ -16,7 +16,7 @@ images: dockerfile_path: Dockerfile from: base inputs: - ocp_4.15_installer: + origin_4.15_installer: as: - registry.ci.openshift.org/ocp/4.15:installer to: machine-os-images diff --git a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd.yaml b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd.yaml index dad8500a56a5d..819dcbac1e797 100644 --- a/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd.yaml +++ b/ci-operator/config/openshift/machine-os-images/openshift-machine-os-images-release-4.15__okd.yaml @@ -3,9 +3,9 @@ base_images: name: "4.15" namespace: origin tag: base - ocp_4.15_installer: + origin_4.15_installer: name: "4.15" - namespace: ocp + namespace: origin tag: installer build_root: from_repository: true @@ -16,7 +16,7 @@ images: dockerfile_path: Dockerfile from: base inputs: - ocp_4.15_installer: + origin_4.15_installer: as: - registry.ci.openshift.org/ocp/4.15:installer to: machine-os-images