Remove workaround and refine process name to be killed

Signed-off-by: Lukas Puehringer <[email protected]>
lukpueh · Apr 29, 2024 · 2b38ef9 · 2b38ef9
1 parent 85c8d0c
commit 2b38ef9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 12 deletions.
diff --git a/tests/scripts/init-vault.sh b/tests/scripts/init-vault.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
-# Start vault in background.  `|| true` eats the non-zero exit code, when the
-# background process is killed, so that it does not fail the Github Action.
-{ vault server -dev -dev-root-token-id="${VAULT_TOKEN}" & } || true
+vault server -dev -dev-root-token-id="${VAULT_TOKEN}" &
 
 until vault status
 do

diff --git a/tests/scripts/stop-vault.sh b/tests/scripts/stop-vault.sh
@@ -1,11 +1,3 @@
 #!/usr/bin/env bash
 
-pid=$(pgrep -f vault)
-kill $pid
-
-# make sure to exit with 0
-while kill -0 $pid
-do
-    sleep 1
-done
-exit 0
+pkill -f "vault server -dev"