From 9c143bced3dffe52e10c2e087326a1e02c711c31 Mon Sep 17 00:00:00 2001 From: Reactor Scram Date: Wed, 15 May 2024 12:08:30 -0500 Subject: [PATCH] test: remove backwards compatibility code for older Docker images (#4993) Closes #4951 --- scripts/tests/direct-download-roaming-network.sh | 5 +---- scripts/tests/systemd/dns-systemd-resolved.sh | 4 +--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/tests/direct-download-roaming-network.sh b/scripts/tests/direct-download-roaming-network.sh index 823f95a48..10c283d6a 100755 --- a/scripts/tests/direct-download-roaming-network.sh +++ b/scripts/tests/direct-download-roaming-network.sh @@ -19,10 +19,7 @@ sleep 1 docker network connect firezone_app firezone-client-1 --ip 172.28.0.200 # Reconnect client with a different IP # Send SIGHUP, triggering `reconnect` internally -# The second command is needed for backwards compatibility with older Docker images -sudo kill -s HUP "$(ps -C firezone-headless-client -o pid=)" || -sudo kill -s HUP "$(ps -C firezone-linux-client -o pid=)" || -exit 1 +sudo kill -s HUP "$(ps -C firezone-headless-client -o pid=)" wait $DOWNLOAD_PID || { echo "Download process failed" diff --git a/scripts/tests/systemd/dns-systemd-resolved.sh b/scripts/tests/systemd/dns-systemd-resolved.sh index 75de9ac13..96b16d54c 100755 --- a/scripts/tests/systemd/dns-systemd-resolved.sh +++ b/scripts/tests/systemd/dns-systemd-resolved.sh @@ -16,9 +16,7 @@ debug_exit() { } # Copy the Linux Client out of its container -docker compose cp client:/bin/"$BINARY_NAME" "$BINARY_NAME" || - docker compose cp client:/bin/firezone-linux-client "$BINARY_NAME" || - exit 1 +docker compose cp client:/bin/"$BINARY_NAME" "$BINARY_NAME" chmod u+x "$BINARY_NAME" sudo chown root:root "$BINARY_NAME" sudo mv "$BINARY_NAME" "/usr/bin/$BINARY_NAME"