From 737ba8eb0ce922723c4089f38e92a7ba22348358 Mon Sep 17 00:00:00 2001
From: Ricardo Maraschini <ricardo.maraschini@gmail.com>
Date: Wed, 22 Jan 2025 16:39:59 +0100
Subject: [PATCH] NO-JIRA: use quay.io/openshift/origin-cli:latest directly

we have the following e2e test failing constantly:

```
Image signature workflow can push a signed image to openshift
registry and verify it
```

this e2e is failing when attempting to build an image. the reported
build failure is as follow:

```
error: build error: building at STEP "RUN source /etc/os-release && rhel_major=${VERSION_ID%!(BADPREC)%!}(MISSING) && yum config-manager --add-repo "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi${rhel_major}/${rhel_major}/\$basearch/baseos/os/"     --add-repo "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi${rhel_major}/${rhel_major}/\$basearch/appstream/os/"":
while running runtime: exit status 6
```

this error seems to be related to the yum wrapper that has been added to
the image.

this pr makes the e2e to use the image directly from the upstream
repository (quay), that image does not contain the yum wrapper.
---
 test/extended/testdata/bindata.go              | 8 --------
 test/extended/testdata/signer-buildconfig.yaml | 8 --------
 2 files changed, 16 deletions(-)

diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go
index 937db4fd5f08..a8ad9d9fd120 100644
--- a/test/extended/testdata/bindata.go
+++ b/test/extended/testdata/bindata.go
@@ -51638,11 +51638,6 @@ items:
       dockerfile: |
         FROM quay.io/openshift/origin-cli:latest
         WORKDIR /var/lib/origin
-        RUN source /etc/os-release \
-            && rhel_major=${VERSION_ID%.*} \
-            && yum config-manager \
-            --add-repo "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi${rhel_major}/${rhel_major}/\$basearch/baseos/os/" \
-            --add-repo "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi${rhel_major}/${rhel_major}/\$basearch/appstream/os/"
         RUN yum install -y skopeo && \
             yum clean all && mkdir -p gnupg && chmod -R 0777 /var/lib/origin
         RUN echo $'%echo Generating openpgp key ...\n\
@@ -51663,9 +51658,6 @@ items:
         env:
           - name: "BUILD_LOGLEVEL"
             value: "2"
-        from:
-          kind: DockerImage
-          name: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
     output:
       to:
         kind: ImageStreamTag
diff --git a/test/extended/testdata/signer-buildconfig.yaml b/test/extended/testdata/signer-buildconfig.yaml
index fbea1c62417c..aa74edeb85d0 100644
--- a/test/extended/testdata/signer-buildconfig.yaml
+++ b/test/extended/testdata/signer-buildconfig.yaml
@@ -18,11 +18,6 @@ items:
       dockerfile: |
         FROM quay.io/openshift/origin-cli:latest
         WORKDIR /var/lib/origin
-        RUN source /etc/os-release \
-            && rhel_major=${VERSION_ID%.*} \
-            && yum config-manager \
-            --add-repo "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi${rhel_major}/${rhel_major}/\$basearch/baseos/os/" \
-            --add-repo "https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi${rhel_major}/${rhel_major}/\$basearch/appstream/os/"
         RUN yum install -y skopeo && \
             yum clean all && mkdir -p gnupg && chmod -R 0777 /var/lib/origin
         RUN echo $'%echo Generating openpgp key ...\n\
@@ -43,9 +38,6 @@ items:
         env:
           - name: "BUILD_LOGLEVEL"
             value: "2"
-        from:
-          kind: DockerImage
-          name: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
     output:
       to:
         kind: ImageStreamTag