diff options
| author | Jochen Sprickerhof <git@jochen.sprickerhof.de> | 2022-12-31 08:05:27 +0100 |
|---|---|---|
| committer | Jochen Sprickerhof <git@jochen.sprickerhof.de> | 2022-12-31 08:05:27 +0100 |
| commit | 9b66c54486a58d334ccc697bddd9d40c7a236908 (patch) | |
| tree | 0180a3f44c4965c28ca99e9b631f759713366dfc | |
| parent | 45a8428a30c2aebeb5163913c8167b318ff65c81 (diff) | |
| download | debvm-9b66c54486a58d334ccc697bddd9d40c7a236908.tar.gz | |
Use more variables
| -rwxr-xr-x | tests/create-and-run.sh | 11 | ||||
| -rwxr-xr-x | tests/dist-upgrades.sh | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/tests/create-and-run.sh b/tests/create-and-run.sh index c92ce1f..540e6c4 100755 --- a/tests/create-and-run.sh +++ b/tests/create-and-run.sh @@ -1,28 +1,29 @@ #!/bin/sh if test "$#" -ne 2; then - echo "$(basename "$0") takes two positional arguments. architecture and release" 1>&2 + echo "$(basename "$0") takes two positional arguments: architecture and release" 1>&2 exit 1 fi ARCHITECTURE=$1 RELEASE=$2 +SSH_KEYPATH=ssh_id +IMAGE=test.ext4 set -eux . "$(dirname "$0")/test_common.sh" cleanup() { - rm -f ssh_id ssh_id.pub test.ext4 + rm -f "$SSH_KEYPATH" "$SSH_KEYPATH.pub" "$IMAGE" } trap cleanup EXIT INT TERM QUIT -SSH_KEYPATH=ssh_id ssh-keygen -f "$SSH_KEYPATH" -N '' -debvm-create -k "$SSH_KEYPATH.pub" -o test.ext4 -a "$ARCHITECTURE" -r "$RELEASE" +debvm-create -k "$SSH_KEYPATH.pub" -o "$IMAGE" -a "$ARCHITECTURE" -r "$RELEASE" SSH_PORT=2222 -timeout 240s debvm-run -s "$SSH_PORT" -i test.ext4 & +timeout 240s debvm-run -s "$SSH_PORT" -i "$IMAGE" & set -- localhost test "$RELEASE" = jessie && set -- -o PubkeyAcceptedKeyTypes=+ssh-rsa "$@" wait_ssh "$@" diff --git a/tests/dist-upgrades.sh b/tests/dist-upgrades.sh index b4d61dd..85c9f4a 100755 --- a/tests/dist-upgrades.sh +++ b/tests/dist-upgrades.sh @@ -8,8 +8,10 @@ set -x . "$(dirname "$0")/test_common.sh" +SSH_KEYPATH=ssh_id + cleanup() { - rm -f ssh_id ssh_id.pub upgrade + rm -f "$SSH_KEYPATH" "$SSH_KEYPATH.pub" upgrade } trap cleanup EXIT INT TERM QUIT @@ -33,7 +35,6 @@ poweroff EOF chmod +x upgrade -SSH_KEYPATH=ssh_id ssh-keygen -f "$SSH_KEYPATH" -N '' debvm-create -k "$SSH_KEYPATH.pub" -r jessie -z 3 -- --customize-hook="copy-in upgrade /usr/local/bin" |