From a72ce4c04b6b35ccd06b7e230bc4e6138aabf492 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 23 Mar 2021 14:49:30 +0100 Subject: [PATCH] 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 (cherry picked from commit c90b0985e50cd9a4a0160d0707af544f319a7fe8) --- tests/functional/all_daemons/container/group_vars/all | 8 ++++---- tests/functional/all_daemons/group_vars/all | 8 ++++---- tests/functional/collocation/container/group_vars/all | 8 ++++---- tests/functional/collocation/group_vars/all | 8 ++++---- tests/functional/docker2podman/group_vars/all | 8 ++++---- tests/functional/podman/group_vars/all | 8 ++++---- tests/functional/tests/rgw/test_rgw.py | 1 - 7 files changed, 24 insertions(+), 25 deletions(-) diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index edbd5c57e..bd123db67 100644 --- 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 6844e0add..707f45368 100644 --- 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 ab0d18e04..3775ede0d 100644 --- 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 9ce1ef395..1aa3b7e1f 100644 --- 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 c54051ee5..38f5e4509 100644 --- 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 e6a41ce9b..895c9d964 100644 --- 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 958450d4e..ab30cda8f 100644 --- 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 -- 2.39.5