Merge "Replace debian:testing with quay.io/opendevmirror/httpd:alpine"

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

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

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

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

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