From b35fe9d32a9e2b294c4d82699f120e311b51172a Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Tue, 2 Oct 2018 16:23:42 -0700 Subject: [PATCH] Add beakerlib to Dockerfile.test Also kill the lorax-composer process and remove /run/weldr/api.socket so that when this is run with podman you don't get an error about attempting to tar up the socket. --- Dockerfile.test | 1 + tests/test_cli.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Dockerfile.test b/Dockerfile.test index 94ae896f..518d1c13 100644 --- a/Dockerfile.test +++ b/Dockerfile.test @@ -18,6 +18,7 @@ RUN dnf -y install \ python3-semantic_version \ python3-sphinx \ python3-rpmfluff \ + beakerlib \ sudo \ tito \ which diff --git a/tests/test_cli.sh b/tests/test_cli.sh index 24f00a15..abc70dc7 100755 --- a/tests/test_cli.sh +++ b/tests/test_cli.sh @@ -19,6 +19,10 @@ done; ./tests/cli/test_blueprints_sanity.sh ./tests/cli/test_compose_sanity.sh +# Stop lorax-composer and remove /run/weldr/api.socket +pkill -9 lorax-composer +rm -f /run/weldr/api.socket + # look for failures grep RESULT_STRING /var/tmp/beakerlib-*/TestResults | grep -v PASS && exit 1