From 3ffa0a1e345eb959e125743310fc21ec9f5a3045 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 17 Feb 2025 12:06:13 -0800
Subject: [PATCH] Replace debian:testing with
 quay.io/opendevmirror/httpd:alpine

We have several tests that were using debian:testing from docker hub as
a base image to deploy some content that would validate execution of
container runtimes. Docker hub has some pretty strict rate limits in
place these days so we'd like to use an image on quay.io instead.
The opendevmirror org is already mirroring the httpd:alpine image there
which is a smal relatively simple image that we can use for this
purpose.

Note we switch from debian with bash to alpine with a busybox sh. But
the tools we rely on (touch, echo, sleep) all appear to be present.

Change-Id: I9bb5db416e3b9601c67de1c053162fd30a977bbd
---
 test-playbooks/container/docker/Dockerfile                | 2 +-
 test-playbooks/registry/buildset-registry-k8s-crio.yaml   | 6 +++---
 .../registry/buildset-registry-k8s-microk8s.yaml          | 8 ++++----
 .../registry/buildset-registry-openshift-docker.yaml      | 6 +++---
 test-playbooks/registry/docker/Dockerfile                 | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test-playbooks/container/docker/Dockerfile b/test-playbooks/container/docker/Dockerfile
index d32f9e817..b4cee694b 100644
--- a/test-playbooks/container/docker/Dockerfile
+++ b/test-playbooks/container/docker/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.io/library/debian:testing
+FROM quay.io/opendevmirror/httpd:alpine
 RUN touch "/test-nonce"
 CMD echo "Zuul container test"; sleep infinity
diff --git a/test-playbooks/registry/buildset-registry-k8s-crio.yaml b/test-playbooks/registry/buildset-registry-k8s-crio.yaml
index 6a3288a6c..746e87c41 100644
--- a/test-playbooks/registry/buildset-registry-k8s-crio.yaml
+++ b/test-playbooks/registry/buildset-registry-k8s-crio.yaml
@@ -28,12 +28,12 @@
         executable: /bin/bash
 
     - name: Run a remote test pod
-      command: kubectl run --image=docker.io/debian:testing upstream-dockertest --command -- /bin/bash -c 'echo Upstream; sleep infinity'
+      command: kubectl run --image=quay.io/opendevmirror/httpd:alpine upstream-quaytest --command -- /bin/sh -c 'echo Upstream; sleep infinity'
     - name: Wait for the pod to be ready
-      command: kubectl wait --for=condition=Ready pod/upstream-dockertest --timeout=60s
+      command: kubectl wait --for=condition=Ready pod/upstream-quaytest --timeout=60s
     - name: Check the output of the pod
       shell: |
         set -o pipefail
-        kubectl logs pod/upstream-dockertest | grep 'Upstream'
+        kubectl logs pod/upstream-quaytest | grep 'Upstream'
       args:
         executable: /bin/bash
diff --git a/test-playbooks/registry/buildset-registry-k8s-microk8s.yaml b/test-playbooks/registry/buildset-registry-k8s-microk8s.yaml
index 253e6de31..7a6d95de5 100644
--- a/test-playbooks/registry/buildset-registry-k8s-microk8s.yaml
+++ b/test-playbooks/registry/buildset-registry-k8s-microk8s.yaml
@@ -35,21 +35,21 @@
         executable: /bin/bash
 
     - name: Run a remote test pod
-      command: kubectl run --image=docker.io/debian:testing upstream-dockertest --command -- /bin/bash -c 'echo Upstream; sleep infinity'
+      command: kubectl run --image=quay.io/opendevmirror/httpd:alpine upstream-quaytest --command -- /bin/sh -c 'echo Upstream; sleep infinity'
 
     - name: Pause
       pause:
         seconds: 60
 
     - name: Describe pod
-      command: kubectl describe pods upstream-dockertest
+      command: kubectl describe pods upstream-quaytest
 
     - name: Wait for the pod to be ready
-      command: kubectl wait --for=condition=Ready pod/upstream-dockertest --timeout=60s
+      command: kubectl wait --for=condition=Ready pod/upstream-quaytest --timeout=60s
 
     - name: Check the output of the pod
       shell: |
         set -o pipefail
-        kubectl logs pod/upstream-dockertest | grep 'Upstream'
+        kubectl logs pod/upstream-quaytest | grep 'Upstream'
       args:
         executable: /bin/bash
diff --git a/test-playbooks/registry/buildset-registry-openshift-docker.yaml b/test-playbooks/registry/buildset-registry-openshift-docker.yaml
index aec5958dd..78a236e0a 100644
--- a/test-playbooks/registry/buildset-registry-openshift-docker.yaml
+++ b/test-playbooks/registry/buildset-registry-openshift-docker.yaml
@@ -24,12 +24,12 @@
         executable: /bin/bash
 
     - name: Run a remote test pod
-      command: oc run --generator=run-pod/v1 --image=debian:testing upstream-dockertest --command -- /bin/bash -c 'echo Upstream; sleep infinity'
+      command: oc run --generator=run-pod/v1 --image=quay.io/opendevmirror/httpd:alpine upstream-quaytest --command -- /bin/sh -c 'echo Upstream; sleep infinity'
     - name: Wait for the pod to be ready
-      command: oc wait --for=condition=Ready pod/upstream-dockertest --timeout=60s
+      command: oc wait --for=condition=Ready pod/upstream-quaytest --timeout=60s
     - name: Check the output of the pod
       shell: |
         set -o pipefail
-        oc logs pod/upstream-dockertest | grep 'Upstream'
+        oc logs pod/upstream-quaytest | grep 'Upstream'
       args:
         executable: /bin/bash
diff --git a/test-playbooks/registry/docker/Dockerfile b/test-playbooks/registry/docker/Dockerfile
index d32f9e817..b4cee694b 100644
--- a/test-playbooks/registry/docker/Dockerfile
+++ b/test-playbooks/registry/docker/Dockerfile
@@ -1,3 +1,3 @@
-FROM docker.io/library/debian:testing
+FROM quay.io/opendevmirror/httpd:alpine
 RUN touch "/test-nonce"
 CMD echo "Zuul container test"; sleep infinity