ceph-mixin: Remove jsonnet building

Signed-off-by: Aswin Toni <aswin.toni@cern.ch>
(cherry picked from commit 2e0e684fc20cbf6c2e48215b431419c8573b3863)

diff --git a/ceph.spec.in b/ceph.spec.in
index a4d6162174e1d71faba8351d8ec4fd72c38daccb..1f68736c3209f08d3cca488a8b771c4db6f98573 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -314,6 +314,7 @@ BuildRequires:  rdma-core-devel
 BuildRequires: liblz4-devel >= 1.7
 # for prometheus-alerts
 BuildRequires:  golang-github-prometheus-prometheus
+BuildRequires: jsonnet
 %endif
 %if 0%{?fedora} || 0%{?rhel}
 Requires:      systemd
@@ -355,6 +356,7 @@ BuildRequires:      python%{python3_pkgversion}-pyOpenSSL
 %endif
 %if 0%{?suse_version}
 BuildRequires: golang-github-prometheus-prometheus
+BuildRequires: jsonnet
 BuildRequires: libxmlsec1-1
 BuildRequires: libxmlsec1-nss1
 BuildRequires: libxmlsec1-openssl1

diff --git a/debian/control b/debian/control
index c87ef69075eabaeac03f1deace3a4ad89181432f..4d99ee36f03045173daa55f85c083eb8ea8ecc25 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: automake,
                g++ (>= 7),
                javahelper,
                jq <pkg.ceph.check>,
+               jsonnet <pkg.ceph.check>,
                junit4,
                libaio-dev,
                libbabeltrace-ctf-dev,

diff --git a/monitoring/ceph-mixin/CMakeLists.txt b/monitoring/ceph-mixin/CMakeLists.txt
index ac1fdb13ea9e8893e102ee2bab4c05fcc5942da7..411cfb970d0d1b80c06c966d61ec9b0fce3ef6e1 100644 (file)
--- a/monitoring/ceph-mixin/CMakeLists.txt
+++ b/monitoring/ceph-mixin/CMakeLists.txt
@@ -11,17 +11,6 @@ if(WITH_GRAFANA)
       include(AddCephTest)
       set(CEPH_BUILD_VIRTUALENV ${CMAKE_BINARY_DIR})
 
-      add_test(NAME jsonnet-build
-          COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jsonnet-build.sh ${CMAKE_CURRENT_BINARY_DIR})
-      set_property(TEST jsonnet-build PROPERTY
-          FIXTURES_SETUP jsonnet)
-      add_test(NAME jsonnet-cleanup
-          COMMAND rm -rf go-jsonnet
-                         ${CMAKE_CURRENT_BINARY_DIR}/jsonnet
-                         ${CMAKE_CURRENT_BINARY_DIR}/jsonnetfmt)
-      set_property(TEST jsonnet-cleanup PROPERTY
-          FIXTURES_CLEANUP jsonnet)
-
       add_test(NAME jsonnet-bundler-build
           COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/jsonnet-bundler-build.sh ${CMAKE_CURRENT_BINARY_DIR})
       set_property(TEST jsonnet-bundler-build PROPERTY
@@ -34,11 +23,10 @@ if(WITH_GRAFANA)
       add_tox_test(grafana-lint TOX_ENVS lint)
       add_tox_test(jsonnet-lint TOX_ENVS jsonnet-lint)
       set_property(TEST run-tox-jsonnet-lint PROPERTY
-          FIXTURES_REQUIRED venv-for-jsonnet-lint jsonnet
-          ENVIRONMENT "PATH=${CMAKE_CURRENT_BINARY_DIR}:$ENV{PATH}")
+          FIXTURES_REQUIRED venv-for-jsonnet-lint)
       add_tox_test(jsonnet-check TOX_ENVS jsonnet-check)
       set_property(TEST run-tox-jsonnet-check PROPERTY
-          FIXTURES_REQUIRED venv-for-jsonnet-check jsonnet jsonnet-bundler
+          FIXTURES_REQUIRED venv-for-jsonnet-check jsonnet-bundler
           ENVIRONMENT "PATH=${CMAKE_CURRENT_BINARY_DIR}:$ENV{PATH}")
 
       add_tox_test(alerts-check TOX_ENVS alerts-check)

diff --git a/monitoring/ceph-mixin/jsonnet-build.sh b/monitoring/ceph-mixin/jsonnet-build.sh
deleted file mode 100755 (executable)
index 8e229f9..0000000
--- a/monitoring/ceph-mixin/jsonnet-build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh -ex
-
-JSONNET_VERSION="v0.18.0"
-OUTPUT_DIR=${1:-$(pwd)}
-
-git clone -b ${JSONNET_VERSION} --depth 1 https://github.com/google/go-jsonnet.git
-cd go-jsonnet
-go build ./cmd/jsonnet
-go build ./cmd/jsonnetfmt
-mv jsonnet jsonnetfmt ${OUTPUT_DIR}