This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 4a3eb71a6 BIGTOP-4078: fix the solr smoketest failed in debian 11
(#1255)
4a3eb71a6 is described below
commit 4a3eb71a6a40b755c3c7638f551ef441055e9aa4
Author: Mac Chen <[email protected]>
AuthorDate: Mon Apr 22 22:52:22 2024 +0800
BIGTOP-4078: fix the solr smoketest failed in debian 11 (#1255)
(cherry picked from commit ac18cace574a6dbd934f766681d599de40de2a04)
---
bigtop-tests/smoke-tests/solr/build.gradle | 3 ++-
provisioner/utils/setup-env-debian.sh | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/bigtop-tests/smoke-tests/solr/build.gradle
b/bigtop-tests/smoke-tests/solr/build.gradle
index 601013d6f..4cc9615fd 100644
--- a/bigtop-tests/smoke-tests/solr/build.gradle
+++ b/bigtop-tests/smoke-tests/solr/build.gradle
@@ -48,8 +48,9 @@ def delete_collection() {
def clean() {
if (file("/tmp/smoke_data").exists()) {
+ String rmCmd = file("/usr/bin/rm").exists() ? "/usr/bin/rm" : "/bin/rm"
exec {
- executable "/usr/bin/rm"
+ executable rmCmd
args "-rf", "/tmp/smoke_data"
}
}
diff --git a/provisioner/utils/setup-env-debian.sh
b/provisioner/utils/setup-env-debian.sh
index af44e053e..ccfee9ef8 100755
--- a/provisioner/utils/setup-env-debian.sh
+++ b/provisioner/utils/setup-env-debian.sh
@@ -42,4 +42,3 @@ else
apt-get install -y apt-transport-https gnupg
echo "local apt = $enable_local_repo ; NOT Enabling local apt. Packages
will be pulled from remote..."
fi
-
