From: Sun Yuechi <sunyuechi@iscas.ac.cn>
Date: Sat, 20 Jun 2026 15:21:01 +0000 (+0800)
Subject: monitoring/ceph-mixin: make jsonnet-bundler clone idempotent
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a764ecf720c536cec35095872e1db41b363104a3;p=ceph.git

monitoring/ceph-mixin: make jsonnet-bundler clone idempotent

A run that aborts before the cleanup fixture runs (timeout, OOM,
interrupt) leaves the clone dir behind, so the next build fails with
"destination path already exists". Remove it first.

Signed-off-by: Sun Yuechi <sunyuechi@iscas.ac.cn>
---

diff --git a/monitoring/ceph-mixin/jsonnet-bundler-build.sh b/monitoring/ceph-mixin/jsonnet-bundler-build.sh
index 463658f186b..bb5b323500c 100755
--- a/monitoring/ceph-mixin/jsonnet-bundler-build.sh
+++ b/monitoring/ceph-mixin/jsonnet-bundler-build.sh
@@ -3,6 +3,8 @@
 JSONNET_VERSION="v0.6.0"
 OUTPUT_DIR=${1:-$(pwd)}
 
+# clean up leftovers from an aborted run so the clone stays idempotent
+rm -rf jsonnet-bundler
 git clone -b ${JSONNET_VERSION} --depth 1 https://github.com/jsonnet-bundler/jsonnet-bundler
 make -C jsonnet-bundler  build
 mv jsonnet-bundler/_output/jb ${OUTPUT_DIR}