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 <dsavinea@redhat.com> (cherry picked from commit 98c9afc)
ceph · Sep 10, 2020 · dd05d8b · dd05d8b
1 parent 218aeda
commit dd05d8b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git 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"
+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/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"
+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
@@ -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"
+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/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"
+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
@@ -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
+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
@@ -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
+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"