modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-04-05 11:48:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Give a unique name to container running tests inside

Browse Source 
Signed-off-by: Chenxiong Qi <cqi@redhat.com>
This commit is contained in:
Chenxiong Qi
2019-07-16 09:44:32 +08:00
parent ec8946af05
commit 5baaeb2fc7
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/run-unittests.sh
View File

@@ -31,6 +31,7 @@ done
image_ns=quay.io/factory2
postgres_image="postgres:9.5.17"
test_container_name="mbs-test"
db_container_name="mbs-test-db"
source_dir="$(realpath "$(dirname "$0")/..")"
volume_mount="${source_dir}:/src:Z"
@@ -41,11 +42,13 @@ db_bg_container=
if [ -n "$enable_py3" ]; then
test_image="${image_ns}/mbs-test-fedora"
test_container_name="${test_container_name}-py3"
else
test_image="${image_ns}/mbs-test-centos"
fi
container_opts=(--rm -v "${volume_mount}" --name mbs-test)
test_container_name="${test_container_name}-$(date +"%H%M%S")"
container_opts=(--rm -v "${volume_mount}" --name "$test_container_name")
if [ -z "$no_tty" ]; then
container_opts+=(-i -t)
@@ -68,8 +71,7 @@ if [ -n "$with_pgsql" ]; then
# Waiting for postgres container to start completely in case tests start too fast.
while true
do
docker exec $db_bg_container psql -U postgres -c '\dp' $db_name >/dev/null 2>&1
if [ $? == 0 ]; then
if docker exec "$db_bg_container" psql -U postgres -c '\dp' $db_name >/dev/null 2>&1; then
break
fi
done