From 7f5be9192256d092522a6a0ef2d201680388d1f7 Mon Sep 17 00:00:00 2001
From: Dmytro Nochevnov <dnochevn@redhat.com>
Date: Fri, 19 Jan 2024 15:12:16 +0200
Subject: [PATCH] Get rid of failing curl in v14-plugins-test-pr-check job
 (#1873)

---
 .ci/openshift-ci/Dockerfile | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/.ci/openshift-ci/Dockerfile b/.ci/openshift-ci/Dockerfile
index 385177ff4c..602797dbc5 100644
--- a/.ci/openshift-ci/Dockerfile
+++ b/.ci/openshift-ci/Dockerfile
@@ -11,25 +11,19 @@
 #   Red Hat, Inc. - initial API and implementation
 
 # Dockerfile to bootstrap build and test in openshift-ci
-FROM registry.access.redhat.com/ubi9/nodejs-18:1
+FROM registry.ci.openshift.org/openshift/release:golang-1.18
 # hadolint ignore=DL3002
 USER 0
 
-# hadolint ignore=DL3041
-RUN dnf install -y -q --allowerasing --nobest nodejs-devel nodejs-libs psmisc python3-pip jq golang httpd-tools \
-    # already installed or installed as deps:
-    openssl openssl-devel ca-certificates make cmake cpp gcc gcc-c++ zlib zlib-devel brotli brotli-devel python3 nodejs-packaging && \
-    dnf update -y && dnf clean all && \
-    npm install -g yarn@1.22 npm@9 && \
-    echo -n "node version: "; node -v; \
-    echo -n "npm  version: "; npm -v; \
-    echo -n "yarn version: "; yarn -v;
+SHELL ["/bin/bash", "-c"]
 
-RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
+# Install yq, kubectl, chectl cli used by olm/olm.sh script.
+# hadolint ignore=DL3041
+# Install yq, kubectl, chectl cli.
+RUN yum install --assumeyes -d1 psmisc python3-pip  httpd-tools nodejs && \
+    pip3 install --upgrade setuptools && \
+    pip3 install yq && \
+    curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
     chmod +x ./kubectl && \
     mv ./kubectl /usr/local/bin && \
-    bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next && \
-    curl https://mirror.openshift.com/pub/openshift-v4/clients/oc/4.6/linux/oc.tar.gz | tar xvzf - -C /usr/local/bin/ oc && \
-    chmod ug+x /usr/local/bin/oc
-
-SHELL ["/bin/bash", "-c"]
+    bash <(curl -sL https://www.eclipse.org/che/chectl/) --channel=next