allow setting source DB creds in env vars

NikolayS · NikolayS · commit 68b4711f2de1 · 2020-08-19T20:45:07.000-07:00
diff --git a/test/2.logical_generic.sh b/test/2.logical_generic.sh
@@ -3,9 +3,9 @@ set -euxo pipefail
 
 DIR=${0%/*}
 IMAGE2TEST="registry.gitlab.com/postgres-ai/database-lab/dblab-server:master"
-SOURCE_DBNAME="test"
-SOURCE_HOST="XXX"
-SOURCE_PASSWORD="XXX"
+SOURCE_DBNAME="${SOURCE_DBNAME:-test}"
+SOURCE_HOST="${SOURCE_HOST:-undefined}"
+SOURCE_PASSWORD="${SOURCE_PASSWORD:-undefined}"
 
 ### Step 1: Prepare a machine with two disks, Docker and ZFS
 
diff --git a/test/_cleanup.sh b/test/_cleanup.sh
@@ -4,7 +4,7 @@ set -euxo pipefail
 ZFS_FILE="$(pwd)/zfs_file"
 
 # TODO: docker rm for all containers that are related to dblab
-sudo docker ps --filter 'label=dblab_control' \
+sudo docker ps -a --filter 'label=dblab_control' \
     | grep -v CONTAINER \
     | awk '{print $1}' \
     | sudo xargs --no-run-if-empty docker rm -f \
