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 dd05d8ba9056eb1fbb92419d5c1dd8d14cfbd350)

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index e7771c6091659412d32716189d4a1e6185210340..61b5eed4cafa870fd997bd1ffd55ceb9a746428f 100644 (file)
--- 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-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"
\ 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 5175194434e99354ea64990b7f11fb486996fb86..67883b0aa7d502b082c25232795529c066bd5e0c 100644 (file)
--- 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-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"
\ 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 831354507394a40c880009f5bf13c7c187a52185..0bd8927402b8e2df4b628ffead39e0ff509e723f 100644 (file)
--- a/tests/functional/collocation/container/group_vars/all
+++ b/tests/functional/collocation/container/group_vars/all
@@ -27,4 +27,5 @@ 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"
\ 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 b109cc709191cc8bea7753282bcc01af92fc9d12..49e670c051c8e79b57226c9169cba509bc1ed949 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -24,4 +24,5 @@ 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"
\ 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 ad823da8c193137cabd30b5aaad01958f0ba2af5..1d31988a5172ba62a489ceb70c7cea3c9d53c7a4 100644 (file)
--- a/tests/functional/docker2podman/group_vars/all
+++ b/tests/functional/docker2podman/group_vars/all
@@ -44,4 +44,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-nautilus
\ No newline at end of file
+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"

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 495837f15dae17c9725d17fbcc847c3823e8dfe5..c98af90abb77a5ff4795875592eef61a98ebf590 100644 (file)
--- a/tests/functional/podman/group_vars/all
+++ b/tests/functional/podman/group_vars/all
@@ -43,4 +43,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-nautilus
\ No newline at end of file
+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"