From 66a9b6b613904d896a382c698cbb79c826e51c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Tue, 31 Oct 2023 16:17:13 +0100
Subject: [PATCH] system_test.py: Add debug output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>
---
 .github/workflows/vm-tests.yml | 4 +---
 tests/system_tests.py          | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/vm-tests.yml b/.github/workflows/vm-tests.yml
index 907d44e20..ee514eaf0 100644
--- a/.github/workflows/vm-tests.yml
+++ b/.github/workflows/vm-tests.yml
@@ -131,7 +131,7 @@ jobs:
           path: .ssh
       - name: Test postinstall VM
         run: |
-          set -e
+          set -ex
           echo "Setup ssh"
           chmod 0600 ./.ssh/automation_ssh_key
           eval "$(ssh-agent)"
@@ -145,9 +145,7 @@ jobs:
           setup-ssh-port-forwarding "$SERVER_ADDRESS"
           
           echo "Run integration tests"
-          set -x
           ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null" "root@${SERVER_ADDRESS}" cat /usr/local/etc/instance.cfg
-          set +x
           test-ncp-instance -a -f "$SNAPSHOT_ID" -b "${VERSION}" --systemtest-args "--skip-update-test" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
     
             echo "Integration tests failed"
diff --git a/tests/system_tests.py b/tests/system_tests.py
index aa8041643..61877e937 100755
--- a/tests/system_tests.py
+++ b/tests/system_tests.py
@@ -264,6 +264,7 @@ def set_cohorte_id(cohorte_id: int) -> CompletedProcess:
             usage()
             sys.exit(2)
         elif opt == '--skip-update-test':
+            print("Skipping update test")
             skip_update_test = True
         elif opt == '--no-ping':
             skip_ping = True