From 2ef51a964c7b21a983dba525110461bb936e4e3d Mon Sep 17 00:00:00 2001
From: Dimitri Savineau <dsavinea@redhat.com>
Date: Mon, 23 Aug 2021 17:18:33 -0400
Subject: [PATCH] tox/tests: use base image from quay.io

Avoid as much as possible to use the docker.io registry so even the centos
base container image should be pulled from the quay.io registry.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 5fa7592977564c90da6e18a1a46207dfa6b759a0)
---
 tests/tox.sh | 6 +++---
 tox.ini      | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/tox.sh b/tests/tox.sh
index 9429c7a8d..c9973258c 100644
--- a/tests/tox.sh
+++ b/tests/tox.sh
@@ -43,8 +43,8 @@ else
   sudo chgrp "$(whoami)" /var/run/docker.sock
 fi
 
-if [ -n "${DOCKER_HUB_USERNAME}" ] && [ -n "${DOCKER_HUB_PASSWORD}" ]; then
-  docker login -u "${DOCKER_HUB_USERNAME}" -p "${DOCKER_HUB_PASSWORD}"
+if [ -n "${REGISTRY_USERNAME}" ] && [ -n "${REGISTRY_PASSWORD}" ]; then
+  docker login -u "${REGISTRY_USERNAME}" -p "${REGISTRY_PASSWORD}" "${REGISTRY}"
 fi
 
 rm -rf "$WORKSPACE"/ceph-ansible || true
@@ -87,7 +87,7 @@ make_output=$(make FLAVORS="$FLAVOR" stage) # Run staging to get DAEMON_IMAGE na
 daemon_image=$(echo "${make_output}" | grep " DAEMON_IMAGE ") # Find DAEMON_IMAGE line
 daemon_image="${daemon_image#*DAEMON_IMAGE*: }" # Remove DAEMON_IMAGE from beginning
 daemon_image="$(echo "${daemon_image}" | tr -s ' ')" # Remove whitespace
-make FLAVORS="$FLAVOR" build.parallel
+make FLAVORS="$FLAVOR" BASEOS_REGISTRY="${REGISTRY}/centos" BASEOS_REPO="centos" build.parallel
 
 # start a local docker registry
 docker run -d -p 5000:5000 --restart=always --name registry registry:2
diff --git a/tox.ini b/tox.ini
index ed5139d84..72ba8d85f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -25,6 +25,7 @@ setenv=
   CEPH_ANSIBLE_BRANCH = stable-5.0
   VAGRANT_PROVIDER = {env:VAGRANT_PROVIDER:libvirt}
   CEPH_ANSIBLE_VAGRANT_BOX = centos/8
+  REGISTRY = quay.io
 deps=
   ceph_ansible: ansible>=2.9,<2.10
 commands=