Merge "Listen on Quay Registry Mirror Ports"

playbooks/roles/mirror/templates/mirror.vhost.j2

@@ -22,6 +22,11 @@ NameVirtualHost *:8083
 Listen 4446
 NameVirtualHost *:4446
 
+Listen 8084
+NameVirtualHost *:8084
+Listen 4447
+NameVirtualHost *:4447
+
 {% raw %}
 LogFormat "%h %l %u [%{%F %T}t.%{msec_frac}t] \"%r\" %>s %b %{cache-status}e \"%{Referer}i\" \"%{User-agent}i\"" combined-cache
 ErrorLogFormat "[%{cu}t] [%-m:%l] [pid %P:tid %T] %7F: %E: [client\ %a] %M% , \ referer\ %{Referer}i"

testinfra/test_mirror.py

@@ -91,4 +91,22 @@ def test_dockerv2_mirror(host):
         cmd = host.run("wget -O- http://[%s]:8082/v2/" %addr)
         assert '401 Unauthorized' in cmd.stderr
 
-# TODO test RHRegistryMirror and QuayMirror
+def test_quay_mirror(host):
+    # QuayRegistryMirror
+    for addr in host.addr(host.backend.host).ipv4_addresses:
+        cmd = host.run("wget --no-check-certificate -qO- "
+                       "https://%s:4447/" % addr)
+        assert 'quay' in cmd.stdout
+
+        cmd = host.run("wget -qO- http://%s:8084/" % addr)
+        assert 'quay' in cmd.stdout
+
+    for addr in host.addr(host.backend.host).ipv6_addresses:
+        cmd = host.run("wget --no-check-certificate -qO- "
+                       "https://[%s]:4447/" % addr)
+        assert 'quay' in cmd.stdout
+
+        cmd = host.run("wget -qO- http://[%s]:8084/" % addr)
+        assert 'quay' in cmd.stdout
+
+# TODO test RHRegistryMirror