tests: switch to quay.ceph.io for dashboard images

for some reason, `quay.io/app-sre/grafana` no longer exist.
as a workaround, all dashboard related images have been mirrored on
quay.ceph.io.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit c90b0985e50cd9a4a0160d0707af544f319a7fe8)

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index edbd5c57e7d6ccf15b1b1d9d04f5e9b8e622b7b7..bd123db67306c8404fbf2c69ea4f04696dcc6b15 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -38,7 +38,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-octopus
-node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
\ No newline at end of file
+node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"

diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 6844e0add834ebf4813ee346bf38a8f6ace4a814..707f4536808c6f34113d3a05877ba9d2074e3ab2 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -31,7 +31,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-octopus
-node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
+node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"

diff --git a/tests/functional/collocation/container/group_vars/all b/tests/functional/collocation/container/group_vars/all
index ab0d18e04cdcb23f21309ab16de1ae80537b464c..3775ede0d709aa53bbb9b0d06d7fcc2fd98fe949 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -27,7 +27,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-octopus
-node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
\ No newline at end of file
+node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"

diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all
index 9ce1ef3957324560dea61e0adee1fcb4c020d98c..1aa3b7e1f1e09820031fa9db4566753ebf0d10bd 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -24,7 +24,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-octopus
-node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
+node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"

diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all
index c54051ee5ea019373520efb3c898845f19f88492..38f5e450948716510c4aa471fd28d56e76ec6596 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -37,7 +37,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-octopus
-node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
+node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index e6a41ce9b431ab097324bb126c854d8d0a457d03..895c9d9641b0c58f2f37918de354b4022cc13b91 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -36,7 +36,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-octopus
-node_exporter_container_image: "quay.io/prometheus/node-exporter:v0.17.0"
-prometheus_container_image: "quay.io/prometheus/prometheus:v2.7.2"
-alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2"
-grafana_container_image: "quay.io/app-sre/grafana:5.4.3"
+node_exporter_container_image: "quay.ceph.io/prometheus/node-exporter:v0.17.0"
+prometheus_container_image: "quay.ceph.io/prometheus/prometheus:v2.7.2"
+alertmanager_container_image: "quay.ceph.io/prometheus/alertmanager:v0.16.2"
+grafana_container_image: "quay.ceph.io/app-sre/grafana:5.4.3"

diff --git a/tests/functional/tests/rgw/test_rgw.py b/tests/functional/tests/rgw/test_rgw.py
index 958450d4e4b8882f30e8659b01b030514e61e846..ab30cda8fe1359f6616f81c8701e8031fec0d93a 100644 (file)
--- a/tests/functional/tests/rgw/test_rgw.py
+++ b/tests/functional/tests/rgw/test_rgw.py
@@ -44,7 +44,6 @@ class TestRGWs(object):
         for key in keys:
             hostnames.append(daemons[key]['metadata']['hostname'])
 
-
     @pytest.mark.no_docker
     def test_rgw_http_endpoint(self, node, host, setup):
         # rgw frontends ip_addr is configured on public_interface