particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test/api.sh: cleanup the DB container

Browse source 
Kill and remove the DB container as part of the test case cleanup.
Without this change, running the test case more than once fails.

Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
Tomas Hozza 2022-03-18 11:57:22 +01:00 • committed by Tom Gundersen
parent 27c260daaf
commit 7a44d00cec
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/cases/api.sh
View file

@ -54,7 +54,8 @@ else
fi fi
# Start the db # Start the db
sudo ${CONTAINER_RUNTIME} run -d --name osbuild-composer-db \ DB_CONTAINER_NAME="osbuild-composer-db"
sudo ${CONTAINER_RUNTIME} run -d --name "${DB_CONTAINER_NAME}" \
--health-cmd "pg_isready -U postgres -d osbuildcomposer" --health-interval 2s \ --health-cmd "pg_isready -U postgres -d osbuildcomposer" --health-interval 2s \
--health-timeout 2s --health-retries 10 \ --health-timeout 2s --health-retries 10 \
-e POSTGRES_USER=postgres \ -e POSTGRES_USER=postgres \
@ -311,10 +312,10 @@ function dump_db() {
set +x set +x
# Make sure we get 3 job entries in the db per compose (depsolve + manifest + build) # Make sure we get 3 job entries in the db per compose (depsolve + manifest + build)
sudo podman exec osbuild-composer-db psql -U postgres -d osbuildcomposer -c "SELECT * FROM jobs;" | grep "9 rows" sudo ${CONTAINER_RUNTIME} exec "${DB_CONTAINER_NAME}" psql -U postgres -d osbuildcomposer -c "SELECT * FROM jobs;" | grep "9 rows"
# Save the result, including the manifest, for the job, straight from the db # Save the result, including the manifest, for the job, straight from the db
sudo podman exec osbuild-composer-db psql -U postgres -d osbuildcomposer -c "SELECT result FROM jobs WHERE type='manifest-id-only'" \ sudo ${CONTAINER_RUNTIME} exec "${DB_CONTAINER_NAME}" psql -U postgres -d osbuildcomposer -c "SELECT result FROM jobs WHERE type='manifest-id-only'" \
| gpg --batch --yes --passphrase "${GPG_SYMMETRIC_PASSPHRASE}" -o "${ARTIFACTS}/build-result.gpg" --symmetric - | gpg --batch --yes --passphrase "${GPG_SYMMETRIC_PASSPHRASE}" -o "${ARTIFACTS}/build-result.gpg" --symmetric -
set -x set -x
} }
@ -342,6 +343,9 @@ function cleanup() {
# dump the DB here to ensure that it gets dumped even if the test fails # dump the DB here to ensure that it gets dumped even if the test fails
dump_db dump_db
sudo ${CONTAINER_RUNTIME} kill "${DB_CONTAINER_NAME}"
sudo ${CONTAINER_RUNTIME} rm "${DB_CONTAINER_NAME}"
sudo rm -rf "$WORKDIR" sudo rm -rf "$WORKDIR"
for P in "${KILL_PIDS[@]}"; do for P in "${KILL_PIDS[@]}"; do