From 67410a97707cf5b8dbc8eda3f7cb8f5a1a69cce6 Mon Sep 17 00:00:00 2001 From: Jakub Rusz Date: Wed, 22 Jan 2020 16:11:03 +0100 Subject: [PATCH] tests: run ssh commands in batch mode --- tests/cli/lib/lib.sh | 2 +- tests/cli/test_build_and_deploy_azure.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/cli/lib/lib.sh b/tests/cli/lib/lib.sh index f9367038..c947aa92 100755 --- a/tests/cli/lib/lib.sh +++ b/tests/cli/lib/lib.sh @@ -132,7 +132,7 @@ composer_stop() { verify_image() { SSH_USER="$1" SSH_MACHINE="$2" - SSH_OPTS="-o StrictHostKeyChecking=no $3" + SSH_OPTS="-o StrictHostKeyChecking=no -o BatchMode=yes $3" rlLogInfo "verify_image: SSH_OPTS:'$SSH_OPTS' SSH_USER:'$SSH_USER' SSH_MACHINE: '$SSH_MACHINE'" check_root_account "$@" if [ "$CHECK_CMDLINE" != 0 ]; then diff --git a/tests/cli/test_build_and_deploy_azure.sh b/tests/cli/test_build_and_deploy_azure.sh index 3bb895d9..201eb2ee 100755 --- a/tests/cli/test_build_and_deploy_azure.sh +++ b/tests/cli/test_build_and_deploy_azure.sh @@ -139,8 +139,8 @@ __EOF__ rlPhaseStartTest "Verify VM instance" # run generic tests to verify the instance and check if cloud-init is installed and running verify_image azure-user "$IP_ADDRESS" "-i $SSH_KEY_DIR/id_rsa" - rlRun -t -c "ssh -o StrictHostKeyChecking=no -i $SSH_KEY_DIR/id_rsa azure-user@$IP_ADDRESS 'rpm -q cloud-init'" - rlRun -t -c "ssh -o StrictHostKeyChecking=no -i $SSH_KEY_DIR/id_rsa azure-user@$IP_ADDRESS 'systemctl status cloud-init'" + rlRun -t -c "ssh -o StrictHostKeyChecking=no -o BatchMode=yes -i $SSH_KEY_DIR/id_rsa azure-user@$IP_ADDRESS 'rpm -q cloud-init'" + rlRun -t -c "ssh -o StrictHostKeyChecking=no -o BatchMode=yes -i $SSH_KEY_DIR/id_rsa azure-user@$IP_ADDRESS 'systemctl status cloud-init'" rlPhaseEnd rlPhaseStartCleanup