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 61b5eed4cafa870fd997bd1ffd55ceb9a746428f..95814b0b05a56cd5e744dab6ec7350ac9d9478b1 100644 (file)
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -45,7 +45,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-nautilus
-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 67883b0aa7d502b082c25232795529c066bd5e0c..574adfaf1ad55c5a01c6434e608357a4eec41ea7 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/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-nautilus
-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 0bd8927402b8e2df4b628ffead39e0ff509e723f..6bc61511f22497b7aeca450b0b6d6602443e3944 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -25,7 +25,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-nautilus
-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 49e670c051c8e79b57226c9169cba509bc1ed949..6a34387f259d193bba47635cb5ef04afbe52ff0e 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -22,7 +22,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-nautilus
-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 1d31988a5172ba62a489ceb70c7cea3c9d53c7a4..4a3134f0716cab53c519c55e7659d000e9151cf0 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -45,7 +45,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-nautilus
-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 c98af90abb77a5ff4795875592eef61a98ebf590..00c75a47bab0d4f6eff37e9b0401be9f97343005 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -44,7 +44,7 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 ceph_docker_image: ceph-ci/daemon
 ceph_docker_image_tag: latest-nautilus
-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