From: Ernesto Puerta <37327689+epuertat@users.noreply.github.com>
Date: Tue, 21 Dec 2021 16:58:17 +0000 (+0100)
Subject: Merge pull request #44190 from rhcs-dashboard/grafana-regex
X-Git-Tag: v17.1.0~200
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cdc9f742df711432bfdf2087f9fa8e428480fc89;p=ceph.git

Merge pull request #44190 from rhcs-dashboard/grafana-regex

monitoring/grafana: improve grafana unit tests variable substitution

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Avan Thakkar <athakkar@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Nizamudeen A <nia@redhat.com>
Reviewed-by: Pere Diaz Bou <pdiazbou@redhat.com>
---

cdc9f742df711432bfdf2087f9fa8e428480fc89
diff --cc monitoring/grafana/dashboards/CMakeLists.txt
index ba049c180d4b7,a9d47483dd5d4..c344958199087
--- a/monitoring/grafana/dashboards/CMakeLists.txt
+++ b/monitoring/grafana/dashboards/CMakeLists.txt
@@@ -11,10 -11,9 +11,10 @@@ if(NOT CEPH_BUILD_VIRTUALENV
  endif()
  
  if(WITH_GRAFANA)
 +  if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64|arm|ARM")
    include(AddCephTest)
    add_tox_test(grafana-check TOX_ENVS grafonnet-check)
-   add_tox_test(grafana-query-test TOX_ENVS promql-query-test)
+   add_tox_test(promql-query-test TOX_ENVS promql-query-test)
    add_tox_test(grafana-lint TOX_ENVS lint)
    set(ver 0.1.0)
    set(name grafonnet-lib)