Apache Solr open-source search software
SOLR-15524: Remove unnecessary container cleanup in docker tests
Houston Putman71c032a102fb
diff --git a/solr/docker/tests/cases/create_bad_core/test.sh b/solr/docker/tests/cases/create_bad_core/test.shindex d32b9cc8656..bf9b51cc463 100755--- a/solr/docker/tests/cases/create_bad_core/test.sh+++ b/solr/docker/tests/cases/create_bad_core/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-echo "Running $container_name"if docker run --name "$container_name" "$tag" solr-create -c 'bad/core?name:here'; thenecho "Bad core creation did not return a failure"diff --git a/solr/docker/tests/cases/create_core/test.sh b/solr/docker/tests/cases/create_core/test.shindex 37e74b855cf..9d23e55fccc 100755--- a/solr/docker/tests/cases/create_core/test.sh+++ b/solr/docker/tests/cases/create_core/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-echo "Running $container_name"docker run --name "$container_name" -d "$tag" solr-create -c gettingstarteddiff --git a/solr/docker/tests/cases/create_core_exec/test.sh b/solr/docker/tests/cases/create_core_exec/test.shindex 872d2ee3563..8f50832248a 100755--- a/solr/docker/tests/cases/create_core_exec/test.sh+++ b/solr/docker/tests/cases/create_core_exec/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-echo "Running $container_name"docker run --name "$container_name" -d "$tag"diff --git a/solr/docker/tests/cases/create_core_randomuser_rootgroup/test.sh b/solr/docker/tests/cases/create_core_randomuser_rootgroup/test.shindex 3a48e78b279..281683e666c 100755--- a/solr/docker/tests/cases/create_core_randomuser_rootgroup/test.sh+++ b/solr/docker/tests/cases/create_core_randomuser_rootgroup/test.sh@@ -21,8 +21,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-echo "Running $container_name"docker run --user 7777:0 --name "$container_name" -d "$tag" solr-create -c gettingstarteddiff --git a/solr/docker/tests/cases/demo-tini/test.sh b/solr/docker/tests/cases/demo-tini/test.shindex fcc7f9163e9..bffcd96053a 100755--- a/solr/docker/tests/cases/demo-tini/test.sh+++ b/solr/docker/tests/cases/demo-tini/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-echo "Running $container_name"docker run --name "$container_name" -d -e TINI=yes "$tag" "solr-demo"diff --git a/solr/docker/tests/cases/demo/test.sh b/solr/docker/tests/cases/demo/test.shindex d0438903f30..6a6b85babe2 100755--- a/solr/docker/tests/cases/demo/test.sh+++ b/solr/docker/tests/cases/demo/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-echo "Running $container_name"docker run --name "$container_name" -d "$tag" "solr-demo"diff --git a/solr/docker/tests/cases/empty-varsolr-dir-ramdomuser-rootgroup/test.sh b/solr/docker/tests/cases/empty-varsolr-dir-ramdomuser-rootgroup/test.shindex 08755def450..37f150ddf1b 100755--- a/solr/docker/tests/cases/empty-varsolr-dir-ramdomuser-rootgroup/test.sh+++ b/solr/docker/tests/cases/empty-varsolr-dir-ramdomuser-rootgroup/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-myvarsolr="${BUILD_DIR}/myvarsolr-${container_name}"prepare_dir_to_mount 7777 "$myvarsolr"diff --git a/solr/docker/tests/cases/empty-varsolr-dir-solr/test.sh b/solr/docker/tests/cases/empty-varsolr-dir-solr/test.shindex 1c0c328d111..155b135f3b9 100755--- a/solr/docker/tests/cases/empty-varsolr-dir-solr/test.sh+++ b/solr/docker/tests/cases/empty-varsolr-dir-solr/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-myvarsolr="${BUILD_DIR}/myvarsolr-${container_name}"prepare_dir_to_mount 8983 "$myvarsolr"diff --git a/solr/docker/tests/cases/empty-varsolr-dir-user/test.sh b/solr/docker/tests/cases/empty-varsolr-dir-user/test.shindex 31fc02bedd0..e9d42f75ba9 100755--- a/solr/docker/tests/cases/empty-varsolr-dir-user/test.sh+++ b/solr/docker/tests/cases/empty-varsolr-dir-user/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-myvarsolr="${BUILD_DIR}/myvarsolr-${container_name}"prepare_dir_to_mount 8983 "$myvarsolr"diff --git a/solr/docker/tests/cases/empty-varsolr-vol-ramdomuser-rootgroup/test.sh b/solr/docker/tests/cases/empty-varsolr-vol-ramdomuser-rootgroup/test.shindex 6f42c6276b3..402a66acbd8 100755--- a/solr/docker/tests/cases/empty-varsolr-vol-ramdomuser-rootgroup/test.sh+++ b/solr/docker/tests/cases/empty-varsolr-vol-ramdomuser-rootgroup/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-myvarsolr="myvarsolr-${container_name}"docker volume rm "$myvarsolr" >/dev/null 2>&1 || truediff --git a/solr/docker/tests/cases/empty-varsolr-vol-solr-nocopy/test.sh b/solr/docker/tests/cases/empty-varsolr-vol-solr-nocopy/test.shindex d5c4e2c814d..11dc15416c0 100755--- a/solr/docker/tests/cases/empty-varsolr-vol-solr-nocopy/test.sh+++ b/solr/docker/tests/cases/empty-varsolr-vol-solr-nocopy/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-myvarsolr="myvarsolr-${container_name}"docker volume rm "$myvarsolr" >/dev/null 2>&1 || truediff --git a/solr/docker/tests/cases/empty-varsolr-vol-solr/test.sh b/solr/docker/tests/cases/empty-varsolr-vol-solr/test.shindex d78851ee9ab..6a6416d7f00 100755--- a/solr/docker/tests/cases/empty-varsolr-vol-solr/test.sh+++ b/solr/docker/tests/cases/empty-varsolr-vol-solr/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-myvarsolr="myvarsolr-${container_name}"docker volume rm "$myvarsolr" >/dev/null 2>&1 || truediff --git a/solr/docker/tests/cases/empty-varsolr-vol-user/test.sh b/solr/docker/tests/cases/empty-varsolr-vol-user/test.shindex c5e19b59027..26fa5505778 100755--- a/solr/docker/tests/cases/empty-varsolr-vol-user/test.sh+++ b/solr/docker/tests/cases/empty-varsolr-vol-user/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-myvarsolr="myvarsolr-${container_name}"docker volume rm "$myvarsolr" >/dev/null 2>&1 || truediff --git a/solr/docker/tests/cases/gosu/test.sh b/solr/docker/tests/cases/gosu/test.shindex 9f1ce920d15..657a0446033 100755--- a/solr/docker/tests/cases/gosu/test.sh+++ b/solr/docker/tests/cases/gosu/test.sh@@ -27,8 +27,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-myvarsolr="${BUILD_DIR}/myvarsolr-${container_name}"prepare_dir_to_mount 8983 "$myvarsolr"diff --git a/solr/docker/tests/cases/initdb/test.sh b/solr/docker/tests/cases/initdb/test.shindex 09fddbd475e..5ff5808780c 100755--- a/solr/docker/tests/cases/initdb/test.sh+++ b/solr/docker/tests/cases/initdb/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-initdb="$BUILD_DIR/initdb-$container_name"prepare_dir_to_mount 8983 "$initdb"diff --git a/solr/docker/tests/cases/precreate_core/test.sh b/solr/docker/tests/cases/precreate_core/test.shindex 1c40cc10f55..ab314186f7d 100755--- a/solr/docker/tests/cases/precreate_core/test.sh+++ b/solr/docker/tests/cases/precreate_core/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-echo "Running $container_name"docker run --name "$container_name" -d -e VERBOSE=yes "$tag" solr-precreate gettingstarteddiff --git a/solr/docker/tests/cases/precreate_core_randomuser_rootgroup/test.sh b/solr/docker/tests/cases/precreate_core_randomuser_rootgroup/test.shindex eaed8575843..633929d785c 100755--- a/solr/docker/tests/cases/precreate_core_randomuser_rootgroup/test.sh+++ b/solr/docker/tests/cases/precreate_core_randomuser_rootgroup/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-echo "Running $container_name"docker run \--user 7777:0 \diff --git a/solr/docker/tests/cases/test_log4j/test.sh b/solr/docker/tests/cases/test_log4j/test.shindex c52a273e00f..5be901aff76 100755--- a/solr/docker/tests/cases/test_log4j/test.sh+++ b/solr/docker/tests/cases/test_log4j/test.sh@@ -19,8 +19,6 @@ set -euo pipefailTEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"source "${TEST_DIR}/../../shared.sh"-container_cleanup "$container_name"-echo "Running $container_name"docker run --name "$container_name" -d -e VERBOSE=yes \-e LOG4J_PROPS=/opt/solr/server/resources/log4j2.xml \diff --git a/solr/docker/tests/cases/user_volume/test.sh b/solr/docker/tests/cases/user_volume/test.shindex 49a386c8a87..92544518f85 100755--- a/solr/docker/tests/cases/user_volume/test.sh+++ b/solr/docker/tests/cases/user_volume/test.sh@@ -55,8 +55,6 @@ mkdir -p "$myvarsolr/data/mycore"mkdir -p "$myvarsolr/logs"touch "$myvarsolr/data/mycore/core.properties"-container_cleanup "$container_name"-echo "Running $container_name"docker run \-v "$myvarsolr:/var/solr" \