From dd05d8ba9056eb1fbb92419d5c1dd8d14cfbd350 Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 8 Sep 2020 10:36:20 -0400 Subject: [PATCH] tests: use grafana from quay.io This changes the grafana container image regitry from docker.io to quay.io to avoid rate limit. This also adds the missing container image values for docker2podman and podman scenarios. Signed-off-by: Dimitri Savineau (cherry picked from commit 98c9afceb936753ebcf3f2c036b73fedbdfa6e3d) --- tests/functional/all_daemons/container/group_vars/all | 3 ++- tests/functional/all_daemons/group_vars/all | 3 ++- tests/functional/collocation/container/group_vars/all | 3 ++- tests/functional/collocation/group_vars/all | 3 ++- tests/functional/docker2podman/group_vars/all | 6 +++++- tests/functional/podman/group_vars/all | 6 +++++- 6 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index 4aca96131..6cbd6f306 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -47,4 +47,5 @@ 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" \ No newline at end of file +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 diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all index e2899fe94..f3123afbb 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -40,4 +40,5 @@ 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" \ No newline at end of file +alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" +grafana_container_image: "quay.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 206db1173..ab0d18e04 100644 --- a/tests/functional/collocation/container/group_vars/all +++ b/tests/functional/collocation/container/group_vars/all @@ -29,4 +29,5 @@ 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" \ No newline at end of file +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 diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all index 7a08ab90a..9ce1ef395 100644 --- a/tests/functional/collocation/group_vars/all +++ b/tests/functional/collocation/group_vars/all @@ -26,4 +26,5 @@ 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" \ No newline at end of file +alertmanager_container_image: "quay.io/prometheus/alertmanager:v0.16.2" +grafana_container_image: "quay.io/app-sre/grafana:5.4.3" diff --git a/tests/functional/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all index 5b2b285db..9ad6bf850 100644 --- a/tests/functional/docker2podman/group_vars/all +++ b/tests/functional/docker2podman/group_vars/all @@ -46,4 +46,8 @@ dashboard_admin_password: $sX!cD$rYU6qR^B! grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.ceph.io ceph_docker_image: ceph-ci/daemon -ceph_docker_image_tag: latest-octopus \ No newline at end of file +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" diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all index ef8c04170..ef3a3db61 100644 --- a/tests/functional/podman/group_vars/all +++ b/tests/functional/podman/group_vars/all @@ -45,4 +45,8 @@ dashboard_admin_password: $sX!cD$rYU6qR^B! grafana_admin_password: +xFRe+RES@7vg24n ceph_docker_registry: quay.ceph.io ceph_docker_image: ceph-ci/daemon -ceph_docker_image_tag: latest-octopus \ No newline at end of file +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" -- 2.39.5