From 12e8b0ce2155a976f5b2a97a1550238183c5da34 Mon Sep 17 00:00:00 2001
From: Jacob Hoffman-Andrews <jsha+github@letsencrypt.org>
Date: Fri, 31 May 2024 14:10:15 -0700
Subject: [PATCH] test: bail if bsetup fails (#7518)

---
 t.sh  | 6 ++++--
 tn.sh | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/t.sh b/t.sh
index a2d1a1ea5..08f181f59 100755
--- a/t.sh
+++ b/t.sh
@@ -3,14 +3,16 @@
 # Outer wrapper for invoking test.sh inside docker-compose.
 #
 
+set -o errexit
+
 if type realpath >/dev/null 2>&1 ; then
   cd "$(realpath -- $(dirname -- "$0"))"
 fi
 
 # Generate the test keys and certs necessary for the integration tests.
-docker compose up bsetup
+docker compose run bsetup
 
 # Use a predictable name for the container so we can grab the logs later
 # for use when testing logs analysis tools.
-docker rm boulder_tests
+docker rm boulder_tests || true
 exec docker compose run --name boulder_tests boulder ./test.sh "$@"
diff --git a/tn.sh b/tn.sh
index f44939184..a3cda0822 100755
--- a/tn.sh
+++ b/tn.sh
@@ -3,14 +3,16 @@
 # Outer wrapper for invoking test.sh with config-next inside docker-compose.
 #
 
+set -o errexit
+
 if type realpath >/dev/null 2>&1 ; then
   cd "$(realpath -- $(dirname -- "$0"))"
 fi
 
 # Generate the test keys and certs necessary for the integration tests.
-docker compose up bsetup
+docker compose run bsetup
 
 # Use a predictable name for the container so we can grab the logs later
 # for use when testing logs analysis tools.
-docker rm boulder_tests
+docker rm boulder_tests || true
 exec docker compose -f docker-compose.yml -f docker-compose.next.yml run boulder ./test.sh "$@"