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>

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 6b03b98734e3fd0243dd2410363f219a20fe0045..f063fb53c997a171afb56b12c2c8e47744b592cc 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-master
 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 863eeb55693c76320db2aa219ff0af8754ef9eb6..733ffff6980e26f2ef8d1753503842ea80207281 100644 (file)
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -38,4 +38,5 @@ grafana_admin_password: +xFRe+RES@7vg24n
 ceph_docker_registry: quay.ceph.io
 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 2e830100c5ff21026335304bdf747fc20a922818..0d1395a506651655eaa03f02fc8cc908789be304 100644 (file)
--- 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-master
 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 7769163f24ea845ad6d71ca54911b88939b4cd95..22368bd01b9ca677f6b7272b801b0d7b9b543d03 100644 (file)
--- a/tests/functional/collocation/group_vars/all
+++ b/tests/functional/collocation/group_vars/all
@@ -23,4 +23,5 @@ dashboard_admin_user_ro: true
 grafana_admin_password: +xFRe+RES@7vg24n
 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 94dc7ae7643dfdf66a1e9a4b326d1ccc56ead5e4..0c808852d452ef7c5a5dd5f0f191774ce7955442 100644 (file)
--- 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-master
\ No newline at end of file
+ceph_docker_image_tag: latest-master
+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

diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all
index 775343adcac59f2958cd381afd9be3733a2269e8..85106395a74f2420cbb1b8acc3c1aa1f4624da60 100644 (file)
--- 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-master
\ No newline at end of file
+ceph_docker_image_tag: latest-master
+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