You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2021/07/08 20:02:02 UTC
[solr] branch main updated: SOLR-15524: Fix Solr Docker test
cleanup.
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/main by this push:
new 1022614 SOLR-15524: Fix Solr Docker test cleanup.
1022614 is described below
commit 1022614efd95d13e230b97f59cb6fac3f228b82f
Author: Houston Putman <ho...@apache.org>
AuthorDate: Thu Jul 8 15:52:25 2021 -0400
SOLR-15524: Fix Solr Docker test cleanup.
---
solr/docker/tests/cases/create_bad_core/test.sh | 2 ++
solr/docker/tests/cases/create_core/test.sh | 2 ++
solr/docker/tests/cases/create_core_exec/test.sh | 2 ++
solr/docker/tests/cases/create_core_randomuser_rootgroup/test.sh | 2 ++
solr/docker/tests/cases/demo-tini/test.sh | 2 ++
solr/docker/tests/cases/demo/test.sh | 2 ++
solr/docker/tests/cases/empty-varsolr-dir-ramdomuser-rootgroup/test.sh | 2 +-
solr/docker/tests/cases/empty-varsolr-dir-solr/test.sh | 2 +-
solr/docker/tests/cases/empty-varsolr-dir-user/test.sh | 2 +-
solr/docker/tests/cases/empty-varsolr-vol-ramdomuser-rootgroup/test.sh | 2 +-
solr/docker/tests/cases/empty-varsolr-vol-solr-nocopy/test.sh | 2 +-
solr/docker/tests/cases/empty-varsolr-vol-solr/test.sh | 2 +-
solr/docker/tests/cases/empty-varsolr-vol-user/test.sh | 2 +-
solr/docker/tests/cases/gosu/test.sh | 2 ++
solr/docker/tests/cases/initdb/test.sh | 2 ++
solr/docker/tests/cases/precreate_core/test.sh | 2 ++
solr/docker/tests/cases/precreate_core_randomuser_rootgroup/test.sh | 2 ++
solr/docker/tests/cases/test_log4j/test.sh | 2 ++
solr/docker/tests/cases/user_volume/test.sh | 2 ++
19 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/solr/docker/tests/cases/create_bad_core/test.sh b/solr/docker/tests/cases/create_bad_core/test.sh
index b27b02c..8f30f9c 100755
--- a/solr/docker/tests/cases/create_bad_core/test.sh
+++ b/solr/docker/tests/cases/create_bad_core/test.sh
@@ -5,6 +5,8 @@ set -euo pipefail
TEST_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'; then
echo "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.sh
index 7a0c7e1..29b3275 100755
--- a/solr/docker/tests/cases/create_core/test.sh
+++ b/solr/docker/tests/cases/create_core/test.sh
@@ -5,6 +5,8 @@ set -euo pipefail
TEST_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 gettingstarted
diff --git a/solr/docker/tests/cases/create_core_exec/test.sh b/solr/docker/tests/cases/create_core_exec/test.sh
index 31dfb68..3b5be5b 100755
--- a/solr/docker/tests/cases/create_core_exec/test.sh
+++ b/solr/docker/tests/cases/create_core_exec/test.sh
@@ -5,6 +5,8 @@ set -euo pipefail
TEST_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.sh
index 1327d5f..ace6e54 100755
--- a/solr/docker/tests/cases/create_core_randomuser_rootgroup/test.sh
+++ b/solr/docker/tests/cases/create_core_randomuser_rootgroup/test.sh
@@ -7,6 +7,8 @@ set -euo pipefail
TEST_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 gettingstarted
diff --git a/solr/docker/tests/cases/demo-tini/test.sh b/solr/docker/tests/cases/demo-tini/test.sh
index c4c142a..8852eac 100755
--- a/solr/docker/tests/cases/demo-tini/test.sh
+++ b/solr/docker/tests/cases/demo-tini/test.sh
@@ -5,6 +5,8 @@ set -euo pipefail
TEST_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.sh
index ca8d10f..86c26f1 100755
--- a/solr/docker/tests/cases/demo/test.sh
+++ b/solr/docker/tests/cases/demo/test.sh
@@ -5,6 +5,8 @@ set -euo pipefail
TEST_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.sh
index be6ef9f..c27edc2 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
@@ -5,7 +5,7 @@ set -euo pipefail
TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
source "${TEST_DIR}/../../shared.sh"
-container_cleanup "$container_name-copier"
+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.sh
index 9813f57..fd74a31 100755
--- a/solr/docker/tests/cases/empty-varsolr-dir-solr/test.sh
+++ b/solr/docker/tests/cases/empty-varsolr-dir-solr/test.sh
@@ -5,7 +5,7 @@ set -euo pipefail
TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
source "${TEST_DIR}/../../shared.sh"
-container_cleanup "$container_name-copier"
+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.sh
index 0f0281f..8d9d049 100755
--- a/solr/docker/tests/cases/empty-varsolr-dir-user/test.sh
+++ b/solr/docker/tests/cases/empty-varsolr-dir-user/test.sh
@@ -5,7 +5,7 @@ set -euo pipefail
TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
source "${TEST_DIR}/../../shared.sh"
-container_cleanup "$container_name-copier"
+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.sh
index 5ae4ca0..3a07cf3 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
@@ -5,7 +5,7 @@ set -euo pipefail
TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
source "${TEST_DIR}/../../shared.sh"
-container_cleanup "$container_name-copier"
+container_cleanup "$container_name"
myvarsolr="myvarsolr-${container_name}"
diff --git a/solr/docker/tests/cases/empty-varsolr-vol-solr-nocopy/test.sh b/solr/docker/tests/cases/empty-varsolr-vol-solr-nocopy/test.sh
index 0b3bc2f..88bd432 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
@@ -5,7 +5,7 @@ set -euo pipefail
TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
source "${TEST_DIR}/../../shared.sh"
-container_cleanup "$container_name-copier"
+container_cleanup "$container_name"
myvarsolr="myvarsolr-${container_name}"
diff --git a/solr/docker/tests/cases/empty-varsolr-vol-solr/test.sh b/solr/docker/tests/cases/empty-varsolr-vol-solr/test.sh
index 1f1c4c1..7cf88e4 100755
--- a/solr/docker/tests/cases/empty-varsolr-vol-solr/test.sh
+++ b/solr/docker/tests/cases/empty-varsolr-vol-solr/test.sh
@@ -5,7 +5,7 @@ set -euo pipefail
TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
source "${TEST_DIR}/../../shared.sh"
-container_cleanup "$container_name-copier"
+container_cleanup "$container_name"
myvarsolr="myvarsolr-${container_name}"
diff --git a/solr/docker/tests/cases/empty-varsolr-vol-user/test.sh b/solr/docker/tests/cases/empty-varsolr-vol-user/test.sh
index 7e6816a..07aab12 100755
--- a/solr/docker/tests/cases/empty-varsolr-vol-user/test.sh
+++ b/solr/docker/tests/cases/empty-varsolr-vol-user/test.sh
@@ -5,7 +5,7 @@ set -euo pipefail
TEST_DIR="${TEST_DIR:-$(dirname -- "${BASH_SOURCE[0]}")}"
source "${TEST_DIR}/../../shared.sh"
-container_cleanup "$container_name-copier"
+container_cleanup "$container_name"
myvarsolr="myvarsolr-${container_name}"
diff --git a/solr/docker/tests/cases/gosu/test.sh b/solr/docker/tests/cases/gosu/test.sh
index 29e411f..11ea0df 100755
--- a/solr/docker/tests/cases/gosu/test.sh
+++ b/solr/docker/tests/cases/gosu/test.sh
@@ -14,6 +14,8 @@ set -euo pipefail
TEST_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.sh
index 4f60ea4..dd8ebb2 100755
--- a/solr/docker/tests/cases/initdb/test.sh
+++ b/solr/docker/tests/cases/initdb/test.sh
@@ -5,6 +5,8 @@ set -euo pipefail
TEST_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.sh
index 3113fd7..b818d9a 100755
--- a/solr/docker/tests/cases/precreate_core/test.sh
+++ b/solr/docker/tests/cases/precreate_core/test.sh
@@ -5,6 +5,8 @@ set -euo pipefail
TEST_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 gettingstarted
diff --git a/solr/docker/tests/cases/precreate_core_randomuser_rootgroup/test.sh b/solr/docker/tests/cases/precreate_core_randomuser_rootgroup/test.sh
index aab55c9..d563b59 100755
--- a/solr/docker/tests/cases/precreate_core_randomuser_rootgroup/test.sh
+++ b/solr/docker/tests/cases/precreate_core_randomuser_rootgroup/test.sh
@@ -5,6 +5,8 @@ set -euo pipefail
TEST_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.sh
index 16053fc..aca28c8 100755
--- a/solr/docker/tests/cases/test_log4j/test.sh
+++ b/solr/docker/tests/cases/test_log4j/test.sh
@@ -5,6 +5,8 @@ set -euo pipefail
TEST_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.sh
index 8edb483..cf6c9e6 100755
--- a/solr/docker/tests/cases/user_volume/test.sh
+++ b/solr/docker/tests/cases/user_volume/test.sh
@@ -41,6 +41,8 @@ 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" \