testing/local/linux: add trap exit to remove container

Fixes #507
saucelabs · Nov 13, 2023 · 572710d · 572710d
1 parent 5cab4f4
commit 572710d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/testing/local/linux/lib.sh b/testing/local/linux/lib.sh
@@ -58,3 +58,9 @@ function run_interactive() {
     podman exec "$container_name" systemctl status forwarder
     podman exec -it "$container_name" /bin/bash
 }
+
+# Usage: remove_container CONTAINER_NAME
+function remove_container() {
+    local container_name="$1"
+    podman rm --force "$container_name"
+}
diff --git a/testing/local/linux/run-debian.sh b/testing/local/linux/run-debian.sh
@@ -19,6 +19,7 @@ build_image "$IMG" debian-systemd.Dockerfile
 create_package "$DIST" forwarder.deb
 
 podman run -p 3128:3128 -d -v ./forwarder.deb:/forwarder.deb --name "$CONTAINER" --replace "$IMG"
+trap "remove_container $CONTAINER" EXIT
+
 podman exec "$CONTAINER" dpkg --force-confdef -i /forwarder.deb
 run_interactive "$CONTAINER"
-podman rm --force "$CONTAINER"
diff --git a/testing/local/linux/run-fedora.sh b/testing/local/linux/run-fedora.sh
@@ -19,6 +19,7 @@ build_image "$IMG" fedora-systemd.Dockerfile
 create_package "$DIST" forwarder.rpm
 
 podman run -p 3128:3128 -d -v ./forwarder.rpm:/forwarder.rpm --name "$CONTAINER" --replace "$IMG"
+trap "remove_container $CONTAINER" EXIT
+
 podman exec "$CONTAINER" dnf -y install /forwarder.rpm
 run_interactive "$CONTAINER"
-podman rm --force "$CONTAINER"