From 975ae0081b19093ec47f2016d9b16e5a57f49118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arda=20G=C3=BC=C3=A7l=C3=BC?= Date: Mon, 22 Apr 2024 07:54:21 +0300 Subject: [PATCH] Reintroduce tools rhel9 base images --- .../config/openshift/oc/openshift-oc-master.yaml | 14 +++++++------- .../openshift/oc/openshift-oc-release-4.16.yaml | 14 +++++++------- .../openshift/oc/openshift-oc-release-4.17.yaml | 14 +++++++------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/ci-operator/config/openshift/oc/openshift-oc-master.yaml b/ci-operator/config/openshift/oc/openshift-oc-master.yaml index d335a5c388ecc..cd7991b813756 100644 --- a/ci-operator/config/openshift/oc/openshift-oc-master.yaml +++ b/ci-operator/config/openshift/oc/openshift-oc-master.yaml @@ -3,6 +3,10 @@ base_images: name: "4.16" namespace: ocp tag: base + base-rhel9: + name: "4.16" + namespace: ocp + tag: base-rhel9 dev-scripts: name: test namespace: ocp-kni @@ -15,10 +19,6 @@ base_images: name: "4.16" namespace: ocp tag: base - ocp_4.16_cli: - name: "4.16" - namespace: ocp - tag: cli ocp_builder_rhel-8-golang-1.21-openshift-4.16: name: builder namespace: ocp @@ -47,11 +47,11 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 to: cli -- context_dir: images/tools +- dockerfile_path: images/tools/Dockerfile inputs: - ocp_4.16_cli: + base-rhel9: as: - - registry.ci.openshift.org/ocp/4.16:cli + - registry.ci.openshift.org/ocp/4.16:base-rhel9 ocp_builder_rhel-9-golang-1.21-openshift-4.16: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml index 5c66fdf742104..d6f6f5aadc071 100644 --- a/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml +++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.16.yaml @@ -3,6 +3,10 @@ base_images: name: "4.16" namespace: ocp tag: base + base-rhel9: + name: "4.16" + namespace: ocp + tag: base-rhel9 dev-scripts: name: test namespace: ocp-kni @@ -15,10 +19,6 @@ base_images: name: "4.16" namespace: ocp tag: base - ocp_4.16_cli: - name: "4.16" - namespace: ocp - tag: cli ocp_builder_rhel-8-golang-1.21-openshift-4.16: name: builder namespace: ocp @@ -47,11 +47,11 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 to: cli -- context_dir: images/tools +- dockerfile_path: images/tools/Dockerfile inputs: - ocp_4.16_cli: + base-rhel9: as: - - registry.ci.openshift.org/ocp/4.16:cli + - registry.ci.openshift.org/ocp/4.16:base-rhel9 ocp_builder_rhel-9-golang-1.21-openshift-4.16: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 diff --git a/ci-operator/config/openshift/oc/openshift-oc-release-4.17.yaml b/ci-operator/config/openshift/oc/openshift-oc-release-4.17.yaml index 552796bea8e1d..2a94334c44439 100644 --- a/ci-operator/config/openshift/oc/openshift-oc-release-4.17.yaml +++ b/ci-operator/config/openshift/oc/openshift-oc-release-4.17.yaml @@ -3,6 +3,10 @@ base_images: name: "4.17" namespace: ocp tag: base + base-rhel9: + name: "4.17" + namespace: ocp + tag: base-rhel9 dev-scripts: name: test namespace: ocp-kni @@ -15,10 +19,6 @@ base_images: name: "4.17" namespace: ocp tag: base - ocp_4.16_cli: - name: "4.17" - namespace: ocp - tag: cli ocp_builder_rhel-8-golang-1.21-openshift-4.16: name: builder namespace: ocp @@ -47,11 +47,11 @@ images: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 to: cli -- context_dir: images/tools +- dockerfile_path: images/tools/Dockerfile inputs: - ocp_4.16_cli: + base-rhel9: as: - - registry.ci.openshift.org/ocp/4.16:cli + - registry.ci.openshift.org/ocp/4.16:base-rhel9 ocp_builder_rhel-9-golang-1.21-openshift-4.16: as: - registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16