From eb15ebd963b78f5a6a27295496ecc3a54e8af01d Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Wed, 1 Dec 2021 13:29:40 +0800 Subject: [PATCH] Hotfix/sangshuduo/td 11616 remove grafanaplugin submodule (#8871) * [TD-11616]: remove grafana plugin submodule * rename grafanaplugin/README.md * temprory modify Jenkinsfile * adjust pos to remove file. --- Jenkinsfile | 5 ++++- src/connector/grafana-pluain-is-removed-from-TDengine.md | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/connector/grafana-pluain-is-removed-from-TDengine.md diff --git a/Jenkinsfile b/Jenkinsfile index c4e0a7d27b..f5b32d55d8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -66,6 +66,7 @@ def pre_test(){ } sh''' cd ${WKC} + [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md" git pull >/dev/null git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD @@ -140,6 +141,7 @@ def pre_test_noinstall(){ } sh''' cd ${WKC} + [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md" git pull >/dev/null git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD @@ -211,11 +213,12 @@ def pre_test_mac(){ } sh''' cd ${WKC} + [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md" git pull >/dev/null git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git clean -dfx - git ls-files --stage | grep 160000 | awk '{print $4}' | xargs git rm --cached + git ls-files --stage | grep 160000 | awk '{print $4}' | xargs git rm --cached git submodule update --init --recursive cd ${WK} git reset --hard HEAD~10 diff --git a/src/connector/grafana-pluain-is-removed-from-TDengine.md b/src/connector/grafana-pluain-is-removed-from-TDengine.md new file mode 100644 index 0000000000..6e7833d5ac --- /dev/null +++ b/src/connector/grafana-pluain-is-removed-from-TDengine.md @@ -0,0 +1 @@ +TDengine Grafana plugin is no more part of the TDengine repo. Please check it out from https://github.com/taosdata/grafanaplugin. -- GitLab