Skip to content

Commit d65ccf6

Browse files
committed
Try to fix grafana state CD test: Refactor
1 parent 884f5ea commit d65ccf6

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

services/monitoring/Makefile

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,4 @@ smokeping_prober_config.yaml: smokeping_prober_config.yaml.j2 ${REPO_CONFIG_LOCA
139139

140140
.PHONY: grafana/assets
141141
grafana/assets: ${REPO_CONFIG_LOCATION}
142-
@if [ ! -d "$(shell dirname ${REPO_CONFIG_LOCATION})/assets/grafana" ]; then \
143-
echo "Error: folder does not exist $$GRAFANA_ASSETS_DIR" >&2; \
144-
exit 1; \
145-
fi; \
146-
if [ ! -d "$(shell dirname ${REPO_CONFIG_LOCATION})/../shared/assets/grafana" ]; then \
147-
echo "Error: folder does not exist $$GRAFANA_COMMON_ASSETS_DIR" >&2; \
148-
exit 1; \
149-
fi; \
150-
rm -rf $(REPO_BASE_DIR)/services/monitoring/grafana/assets || true; \
151-
mkdir -p $(REPO_BASE_DIR)/services/monitoring/grafana/assets; \
152-
cp -r $(shell dirname ${REPO_CONFIG_LOCATION})/assets/grafana/* $(REPO_BASE_DIR)/services/monitoring/grafana/assets; \
153-
cp -r $(shell dirname ${REPO_CONFIG_LOCATION})/../shared/assets/grafana $(REPO_BASE_DIR)/services/monitoring/grafana/assets/shared; \
142+
@$(MAKE_C) grafana assets

services/monitoring/grafana/Makefile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,18 @@ ensure-grafana-online:
6262
echo "Max attempts reached, Grafana is still unreachable."; \
6363
exit 1; \
6464
fi;
65+
66+
.PHONY: assets
67+
assets: ${REPO_CONFIG_LOCATION}
68+
@if [ ! -d "$(shell dirname ${REPO_CONFIG_LOCATION})/assets/grafana" ]; then \
69+
echo "Error: folder does not exist $$GRAFANA_ASSETS_DIR" >&2; \
70+
exit 1; \
71+
fi; \
72+
if [ ! -d "$(shell dirname ${REPO_CONFIG_LOCATION})/../shared/assets/grafana" ]; then \
73+
echo "Error: folder does not exist $$GRAFANA_COMMON_ASSETS_DIR" >&2; \
74+
exit 1; \
75+
fi; \
76+
rm -rf $(REPO_BASE_DIR)/services/monitoring/grafana/assets || true; \
77+
mkdir -p $(REPO_BASE_DIR)/services/monitoring/grafana/assets; \
78+
cp -r $(shell dirname ${REPO_CONFIG_LOCATION})/assets/grafana/* $(REPO_BASE_DIR)/services/monitoring/grafana/assets; \
79+
cp -r $(shell dirname ${REPO_CONFIG_LOCATION})/../shared/assets/grafana $(REPO_BASE_DIR)/services/monitoring/grafana/assets/shared; \

0 commit comments

Comments
 (0)