From 7dca1d629058fdcb2552da4a6b80952746c4d0f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Mon, 23 Oct 2023 16:48:53 +0200
Subject: [PATCH 01/10] ncp-check-version: Temporarily override canary setting
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>
---
 bin/ncp-check-version | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/ncp-check-version b/bin/ncp-check-version
index b60909a59..dc499ad65 100755
--- a/bin/ncp-check-version
+++ b/bin/ncp-check-version
@@ -16,7 +16,9 @@ git clone -b "$BRANCH" --depth 20 -q --bare https://github.com/nextcloud/nextclo
 cd "$TEMPDIR" || exit 1
 VER=$( git describe --always --tags | grep -oP "v\d+\.\d+\.\d+" )
 
-canary="$(get_app_param ncp-community.sh CANARY)"
+canary="$(. /usr/local/etc/library.sh; find_app_param ncp-community.sh CANARY)"
+# TODO: Remove temporary canary override after staged rollouts test
+canary="no"
 
 [[ "$canary" != "yes" ]] && [[ -f "/usr/local/etc/instance.cfg" ]] && {
   cohorte_id="$(jq .cohorteId /usr/local/etc/instance.cfg)"

From 2df558d2427af2e250f6fd7291d1d3f793ce3e1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Mon, 23 Oct 2023 20:28:15 +0200
Subject: [PATCH 02/10] tests: Remove deprecated syntax for headless option
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>
---
 tests/activation_tests.py | 4 ++--
 tests/nextcloud_tests.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/activation_tests.py b/tests/activation_tests.py
index 7e871e595..e45ad65de 100755
--- a/tests/activation_tests.py
+++ b/tests/activation_tests.py
@@ -163,13 +163,13 @@ def test_activation(IP, nc_port, admin_port, options, wait_timeout=120):
         sys.exit(2)
 
     arg_timeout = 120
-    options = Options()
+    options = webdriver.FirefoxOptions()
     for opt, arg in opts:
         if opt in ('-h', '--help'):
             usage()
             sys.exit(2)
         elif opt == '--no-gui':
-            options.headless = True
+            options.add_argument("-headless")
         elif opt in ('-t', '--timeout'):
             arg_timeout = int(arg)
         else:
diff --git a/tests/nextcloud_tests.py b/tests/nextcloud_tests.py
index 96e0dc8a2..6eac08535 100755
--- a/tests/nextcloud_tests.py
+++ b/tests/nextcloud_tests.py
@@ -279,7 +279,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver):
         usage()
         sys.exit(2)
 
-    options = Options()
+    options = webdriver.FirefoxOptions()
     for opt, arg in opts:
         if opt in ('-h', '--help'):
             usage()
@@ -288,7 +288,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver):
             if os.path.exists(test_cfg):
                 os.unlink(test_cfg)
         elif opt == '--no-gui':
-            options.headless = True
+            options.add_argument("-headless")
         else:
             usage()
             sys.exit(2)

From 4632ddb663358023250c264b7655286d889b8706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Mon, 23 Oct 2023 20:49:54 +0200
Subject: [PATCH 03/10] .github/*: Use latest version of selenium
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/build-docker.yml    | 4 ++--
 .github/workflows/build-lxd.yml       | 4 ++--
 .github/workflows/build-sd-images.yml | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 49928c094..6535da407 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -154,7 +154,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup Selenium
-        run: pip install selenium==4.10.0
+        run: pip install selenium
 
       - name: Wait for container startup
         run: |
@@ -421,7 +421,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup Selenium
-        run: pip install selenium==4.10.0
+        run: pip install selenium
       - name: Wait for container startup
         run: |
           set -e
diff --git a/.github/workflows/build-lxd.yml b/.github/workflows/build-lxd.yml
index 98738a94f..9b81a693c 100644
--- a/.github/workflows/build-lxd.yml
+++ b/.github/workflows/build-lxd.yml
@@ -208,7 +208,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup Selenium
-        run: pip install selenium==4.10.0
+        run: pip install selenium
       - name: download LXD image from artifact store
         uses: actions/download-artifact@v3
         with:
@@ -331,7 +331,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Setup Selenium
-        run: pip install selenium==4.10.0
+        run: pip install selenium
       - name: download LXD image from artifact store
         uses: actions/download-artifact@v3
         with:
diff --git a/.github/workflows/build-sd-images.yml b/.github/workflows/build-sd-images.yml
index accd568eb..fededd8a5 100644
--- a/.github/workflows/build-sd-images.yml
+++ b/.github/workflows/build-sd-images.yml
@@ -173,7 +173,7 @@ jobs:
           set -x
           mv output/${ARTIFACT_FILE?} ncp.img
           sudo apt-get install -y systemd-container
-          sudo pip install selenium==4.10.0
+          sudo pip install selenium
           sudo rm -rf raspbian_root
           . ./build/buildlib.sh
           mount_raspbian "ncp.img"

From ddf7a5faa75fa8a29ace83bb85e78e5b77686c7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Tue, 24 Oct 2023 12:38:32 +0200
Subject: [PATCH 04/10] nextcloud_tests.py: Increase wait timeout
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>
---
 tests/nextcloud_tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/nextcloud_tests.py b/tests/nextcloud_tests.py
index 6eac08535..048b854f4 100755
--- a/tests/nextcloud_tests.py
+++ b/tests/nextcloud_tests.py
@@ -148,7 +148,7 @@ def test_nextcloud(IP: str, nc_port: str, driver: WebDriver):
     test.report("password", "Wrong password" not in driver.page_source, msg="Failed to login with provided password")
 
     test.new("settings config")
-    wait = WebDriverWait(driver, 30)
+    wait = WebDriverWait(driver, 60)
     try:
         wait.until(VisibilityOfElementLocatedByAnyLocator([(By.CSS_SELECTOR, "#security-warning-state-ok"),
                                                            (By.CSS_SELECTOR, "#security-warning-state-warning"),

From eb35f8344e85cc62cd46d4985a25aa3533193950 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Wed, 25 Oct 2023 10:46:52 +0200
Subject: [PATCH 05/10] .github/publish-image.yml: Migrate from hub to gh
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/publish-image.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/publish-image.yml b/.github/workflows/publish-image.yml
index 3d09f30ff..49a083e80 100644
--- a/.github/workflows/publish-image.yml
+++ b/.github/workflows/publish-image.yml
@@ -64,7 +64,7 @@ jobs:
           success=false
           for i in {1..5}
           do
-            body="$(hub release show -f "%b" "${VERSION}")"
+            body="$(gh release view --json body "${VERSION}" | jq -r '.body')"
             if ! [[ "$body" =~ .*'**Checksums:**'.* ]]
             then
             
@@ -80,7 +80,7 @@ jobs:
           \`\`\`"
           
             gh release edit "${VERSION?}" -n "$body"
-            if hub release show -f "%b" "${VERSION}" | grep "$checksum"
+            if gh release view --json body "${VERSION}" | jq -r '.body' | grep "$checksum"
             then
               success=true
               break

From 61ba6a63fa4e054b180bd7b6fb671ca122511d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:54:20 +0200
Subject: [PATCH 06/10] system_tests.py: Add auto update test
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>
---
 bin/ncp-provisioning.sh         |  4 +-
 generate_cohortes.sh            |  2 +-
 tests/system_tests.py           | 74 +++++++++++++++++++++++++++++++--
 updates/{1.52.5.sh => 1.53.0sh} |  2 +-
 4 files changed, 75 insertions(+), 7 deletions(-)
 rename updates/{1.52.5.sh => 1.53.0sh} (97%)

diff --git a/bin/ncp-provisioning.sh b/bin/ncp-provisioning.sh
index 88960eda3..03679c2a1 100644
--- a/bin/ncp-provisioning.sh
+++ b/bin/ncp-provisioning.sh
@@ -73,10 +73,10 @@ if needs_decrypt; then
 fi
 
 [[ -f /usr/local/etc/instance.cfg ]] || {
-  cohorte_id=$((1 + RANDOM % 100))
+  cohorte_id=$((RANDOM % 100))
   cat > /usr/local/etc/instance.cfg <<EOF
 {
-  "cohorteId": ${cohorte_id},
+  "cohorteId": ${cohorte_id}
 }
 EOF
 }
diff --git a/generate_cohortes.sh b/generate_cohortes.sh
index 1f44df04e..f106af0ff 100755
--- a/generate_cohortes.sh
+++ b/generate_cohortes.sh
@@ -3,7 +3,7 @@
 #min=$((101-${1:-50}))
 all=({100..1})
 cohortes=()
-for i in ${all[@]:0:$1}
+for i in "${all[@]:0:${1?}}"
 do
   cohorte_id=$((RANDOM % i))
   while [[ " ${cohortes[*]} " =~ .*" ${cohorte_id} ".* ]]
diff --git a/tests/system_tests.py b/tests/system_tests.py
index dacbb18e3..c2457a248 100755
--- a/tests/system_tests.py
+++ b/tests/system_tests.py
@@ -11,6 +11,7 @@
 
 More at https://ownyourbits.com
 """
+import json
 
 pre_cmd = []
 
@@ -18,7 +19,8 @@
 import getopt
 import os
 import signal
-from subprocess import run, getstatusoutput, PIPE
+from subprocess import run, getstatusoutput, PIPE, CompletedProcess
+from typing import Optional
 
 processes_must_be_running = [
         'apache2',
@@ -174,23 +176,88 @@ def signal_handler(sig, frame):
         sys.exit(0)
 
 
+class ProcessExecutionException(Exception):
+    pass
+
+
+def test_autoupdates():
+    def handle_error(r: CompletedProcess) -> CompletedProcess:
+        if r.returncode != 0:
+            print(f"{tc.red}error{tc.normal}\n{r.stdout.decode('utf-8') if r.stdout else ''}\n{r.stderr.decode('utf-8') if r.stderr else ''}"
+                  f" -- command failed: '{' '.join(r.args)}'")
+            raise ProcessExecutionException()
+        return CompletedProcess(r.args,
+                                r.returncode,
+                                r.stdout.decode('utf-8') if r.stdout else '',
+                                r.stderr.decode('utf-8') if r.stderr else '')
+
+    def set_cohorte_id(cohorte_id: int) -> CompletedProcess:
+        r = handle_error(run(pre_cmd + ['cat', '/usr/local/etc/instance.cfg'], stdout=PIPE, stderr=PIPE))
+        try:
+            instance_cfg = json.loads(r.stdout)
+        except json.decoder.JSONDecodeError as e:
+            print(f"{tc.red}error{tc.normal} instance.cfg could not be parsed, was: {r.stdout}")
+            raise e
+
+        instance_cfg['cohorteId'] = cohorte_id
+        return handle_error(run(pre_cmd + ['bash', '-c', f'echo \'{json.dumps(instance_cfg)}\' > /usr/local/etc/instance.cfg'], stdout=PIPE, stderr=PIPE))
+
+    print(f"[updates] {tc.brown}staged rollouts{tc.normal}", end=' ')
+    try:
+        result = handle_error(run(pre_cmd + ['cat', '/usr/local/etc/ncp-version'], stdout=PIPE, stderr=PIPE))
+        if 'v99.99.99' in result.stdout:
+            print(f"{tc.yellow}skipped{tc.normal} (already updated to v99.99.99)")
+            return True
+        handle_error(run(pre_cmd + ['rm', '-f', '/var/run/.ncp-latest-version']))
+        result = handle_error(run(pre_cmd + ['sed', '-i', 's|BRANCH="master"|BRANCH="testing/staged-rollouts-1"|', '/usr/local/bin/ncp-check-version'], stdout=PIPE, stderr=PIPE))
+        set_cohorte_id(1)
+        result = run(pre_cmd + ['test', '-f', '/var/run/.ncp-latest-version'], stdout=PIPE, stderr=PIPE)
+        if result.returncode == 0:
+            result = handle_error(run(pre_cmd + ['cat', '/var/run/.ncp-latest-version'], stdout=PIPE, stderr=PIPE))
+            if 'v99.99.99' in result.stdout:
+                print(f"{tc.red}error{tc.normal} Auto update to v99.99.99 was unexpectedly not prevented by disabled cohorte id")
+                return False
+
+        set_cohorte_id(99)
+        handle_error(run(pre_cmd + ['/usr/local/bin/ncp-check-version'], stdout=PIPE, stderr=PIPE))
+        result = handle_error(run(pre_cmd + ['cat', '/var/run/.ncp-latest-version'], stdout=PIPE, stderr=PIPE))
+        if 'v99.99.99' not in result.stdout:
+            print(f"{tc.red}error{tc.normal} Expected latest detected version to be v99.99.99, was {result.stdout}")
+            return False
+
+        handle_error(run(pre_cmd + ['/usr/local/bin/ncp-test-updates']))
+        handle_error(run(pre_cmd + ['ncp-update', 'testing/staged-rollouts-1'], stdout=PIPE, stderr=PIPE))
+        result = handle_error(run(pre_cmd + ['cat', '/usr/local/etc/v99.99.99.success'], stdout=PIPE, stderr=PIPE))
+        if 'updated' not in result.stdout:
+            print(f"{tc.red}error{tc.normal} update to v99.99.99 did not succeed")
+            return False
+        print(f"{tc.green}ok{tc.normal}")
+
+    except ProcessExecutionException:
+        return False
+
+    return True
+
 if __name__ == "__main__":
 
     signal.signal(signal.SIGINT, signal_handler)
 
     # parse options
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'h', ['help', 'no-ping', 'non-interactive'])
+        opts, args = getopt.getopt(sys.argv[1:], 'h', ['help', 'no-ping', 'non-interactive', 'skip-update-test'])
     except getopt.GetoptError:
         usage()
         sys.exit(2)
 
     skip_ping = False
     interactive = True
+    skip_update_test = False
     for opt, arg in opts:
         if opt in ('-h', '--help'):
             usage()
             sys.exit(2)
+        elif opt == '--skip-update-test':
+            skip_update_test = True
         elif opt == '--no-ping':
             skip_ping = True
         elif opt == '--non-interactive':
@@ -282,8 +349,9 @@ def signal_handler(sig, frame):
     files1_result  = check_files_exist(files_must_exist)
     files2_result  = check_files_dont_exist(files_must_not_exist)
     notify_push_result = check_notify_push()
+    update_test_result = True if skip_update_test else test_autoupdates()
 
-    if running_result and install_result and files1_result and files2_result and notify_push_result:
+    if running_result and install_result and files1_result and files2_result and notify_push_result and update_test_result:
         sys.exit(0)
     else:
         sys.exit(1)
diff --git a/updates/1.52.5.sh b/updates/1.53.0sh
similarity index 97%
rename from updates/1.52.5.sh
rename to updates/1.53.0sh
index a81f3c9ba..c2c4fa807 100644
--- a/updates/1.52.5.sh
+++ b/updates/1.53.0sh
@@ -4,7 +4,7 @@
   cohorte_id=$((RANDOM % 100))
   cat > /usr/local/etc/instance.cfg <<EOF
 {
-  "cohorteId": ${cohorte_id},
+  "cohorteId": ${cohorte_id}
 }
 EOF
 }

From fa793b317370c58f4b37fb57b8679df8b8d40f22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Kn=C3=B6ppler?=
 <6317548+theCalcaholic@users.noreply.github.com>
Date: Thu, 26 Oct 2023 19:06:26 +0200
Subject: [PATCH 07/10] install.sh: Fix ncp-provisioning not being executed on
 baremetal install
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 |  3 +++
 bin/ncp-provisioning.sh        |  3 ++-
 install.sh                     |  8 +++++---
 tests/system_tests.py          | 17 ++++++++++++-----
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/vm-tests.yml b/.github/workflows/vm-tests.yml
index 289d878b9..c6443f14e 100644
--- a/.github/workflows/vm-tests.yml
+++ b/.github/workflows/vm-tests.yml
@@ -145,6 +145,9 @@ 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}" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
     
             echo "Integration tests failed"
diff --git a/bin/ncp-provisioning.sh b/bin/ncp-provisioning.sh
index 03679c2a1..a34ac934f 100644
--- a/bin/ncp-provisioning.sh
+++ b/bin/ncp-provisioning.sh
@@ -3,7 +3,7 @@
 # this script runs at startup to provide an unique random passwords for each instance
 
 source /usr/local/etc/library.sh
-
+set -x
 ## redis provisioning
 
 CFG=/var/www/nextcloud/config/config.php
@@ -79,6 +79,7 @@ fi
   "cohorteId": ${cohorte_id}
 }
 EOF
+  cat /usr/local/etc/instance.cfg
 }
 
 
diff --git a/install.sh b/install.sh
index e72df3fa7..058029d14 100644
--- a/install.sh
+++ b/install.sh
@@ -35,10 +35,12 @@ apt-get install --no-install-recommends -y git ca-certificates sudo lsb-release
 # get install code
 if [[ "${CODE_DIR}" == "" ]]; then
   echo "Getting build code..."
-  CODE_DIR="${TEMPDIR}"/nextcloudpi
-  git clone -b "${BRANCH}" https://github.com/nextcloud/nextcloudpi.git "${CODE_DIR}"
+  CODE_DIR_TMP="${TEMPDIR}"/nextcloudpi
+  git clone -b "${BRANCH}" https://github.com/nextcloud/nextcloudpi.git "${CODE_DIR_TMP}"
+  cd "$CODE_DIR_TMP"
+else
+  cd "${CODE_DIR}"
 fi
-cd "${CODE_DIR}"
 
 # install NCP
 echo -e "\nInstalling NextCloudPi..."
diff --git a/tests/system_tests.py b/tests/system_tests.py
index c2457a248..aa8041643 100755
--- a/tests/system_tests.py
+++ b/tests/system_tests.py
@@ -12,6 +12,7 @@
 More at https://ownyourbits.com
 """
 import json
+import subprocess
 
 pre_cmd = []
 
@@ -192,11 +193,17 @@ def handle_error(r: CompletedProcess) -> CompletedProcess:
                                 r.stderr.decode('utf-8') if r.stderr else '')
 
     def set_cohorte_id(cohorte_id: int) -> CompletedProcess:
-        r = handle_error(run(pre_cmd + ['cat', '/usr/local/etc/instance.cfg'], stdout=PIPE, stderr=PIPE))
+        proc = subprocess.Popen(pre_cmd + ['cat', '/usr/local/etc/instance.cfg'], stdout=subprocess.PIPE, shell=False)
+        #handle_error(run(pre_cmd + ['cat', '/usr/local/etc/instance.cfg'], stdout=subprocess.STDOUT, stderr=subprocess.STDOUT))
+        #r = handle_error(run(pre_cmd + ['cat', '/usr/local/etc/instance.cfg'], stdout=PIPE, stderr=PIPE))
+        (out, err) = proc.communicate()
+        if proc.returncode != 0:
+            raise ProcessExecutionException()
         try:
-            instance_cfg = json.loads(r.stdout)
+            instance_cfg = json.loads(out)
         except json.decoder.JSONDecodeError as e:
-            print(f"{tc.red}error{tc.normal} instance.cfg could not be parsed, was: {r.stdout}")
+            print(f"{tc.red}error{tc.normal} /usr/local/etc/instance.cfg could not be parsed, was: {out}\n{err}")
+            print(f"Command: '{' '.join(pre_cmd + ['cat', '/usr/local/etc/instance.cfg'])}'")
             raise e
 
         instance_cfg['cohorteId'] = cohorte_id
@@ -209,7 +216,7 @@ def set_cohorte_id(cohorte_id: int) -> CompletedProcess:
             print(f"{tc.yellow}skipped{tc.normal} (already updated to v99.99.99)")
             return True
         handle_error(run(pre_cmd + ['rm', '-f', '/var/run/.ncp-latest-version']))
-        result = handle_error(run(pre_cmd + ['sed', '-i', 's|BRANCH="master"|BRANCH="testing/staged-rollouts-1"|', '/usr/local/bin/ncp-check-version'], stdout=PIPE, stderr=PIPE))
+        handle_error(run(pre_cmd + ['sed', '-i', 's|BRANCH="master"|BRANCH="testing/staged-rollouts-1"|', '/usr/local/bin/ncp-check-version'], stdout=PIPE, stderr=PIPE))
         set_cohorte_id(1)
         result = run(pre_cmd + ['test', '-f', '/var/run/.ncp-latest-version'], stdout=PIPE, stderr=PIPE)
         if result.returncode == 0:
@@ -323,7 +330,7 @@ def set_cohorte_id(cohorte_id: int) -> CompletedProcess:
                tc.yellow + ssh_cmd + tc.normal + "...")
         binaries_must_be_installed = binaries_must_be_installed + binaries_no_docker
         pre_cmd = ['ssh', '-o UserKnownHostsFile=/dev/null' , '-o PasswordAuthentication=no',
-                '-o StrictHostKeyChecking=no', '-o ConnectTimeout=1', ssh_cmd[4:]]
+                   '-o StrictHostKeyChecking=no', '-o ConnectTimeout=10', ssh_cmd[4:]]
 
         if not skip_ping:
             at_char = ssh_cmd.index('@')

From ab66d2fd47a36bd9b180a3d366a75aebb42b2c85 Mon Sep 17 00:00:00 2001
From: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
Date: Tue, 31 Oct 2023 11:22:30 +0100
Subject: [PATCH 08/10] vm-tests.yml: Skip update tests for vms (for now)

Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
---
 .github/workflows/vm-tests.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/vm-tests.yml b/.github/workflows/vm-tests.yml
index c6443f14e..907d44e20 100644
--- a/.github/workflows/vm-tests.yml
+++ b/.github/workflows/vm-tests.yml
@@ -148,7 +148,7 @@ jobs:
           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}" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
+          test-ncp-instance -a -f "$SNAPSHOT_ID" -b "${VERSION}" --systemtest-args "--skip-update-test" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
     
             echo "Integration tests failed"
             echo "Here are the last lines of ncp-install.log:"
@@ -220,7 +220,7 @@ jobs:
           echo "Run integration tests"
           setup-ssh-port-forwarding "$SERVER_ADDRESS"
           
-          test-ncp-instance -a -f "$SNAPSHOT_ID" -b "${VERSION}" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
+          test-ncp-instance -a -f "$SNAPSHOT_ID" -b "${VERSION}" --systemtest-args "--skip-update-test" "root@${SERVER_ADDRESS}" "localhost" "8443" "9443" || {
           
             echo "Integration tests failed"
             echo "Here are the last lines of ncp-install.log:"

From cb962d0914969d21a2f1891b958e6d063c1baa08 Mon Sep 17 00:00:00 2001
From: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
Date: Tue, 31 Oct 2023 11:23:52 +0100
Subject: [PATCH 09/10] Add support for NC 27.1.3

Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
---
 changelog.md                      | 4 ++--
 etc/ncp-config.d/nc-nextcloud.cfg | 2 +-
 etc/ncp.cfg                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index 86c72c90d..fdddfbc82 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,10 @@
 # NextcloudPi Changelog
 
-## [v1.52.5](https://github.com/nextcloud/nextcloudpi/tree/v1.52.5) (2023-10-10) Staged Rollouts and NC 27.1.2
+## [v1.52.5](https://github.com/nextcloud/nextcloudpi/tree/v1.52.5) (2023-10-10) Staged Rollouts and NC 27.1.3
 
 ### Changes
 
-- Add support for Nextcloud 27.1.2
+- Add support for Nextcloud 27.1.3
 - Add support for staged rollouts
 
 
diff --git a/etc/ncp-config.d/nc-nextcloud.cfg b/etc/ncp-config.d/nc-nextcloud.cfg
index e49823a17..be0a0e4bd 100644
--- a/etc/ncp-config.d/nc-nextcloud.cfg
+++ b/etc/ncp-config.d/nc-nextcloud.cfg
@@ -9,7 +9,7 @@
     {
       "id": "VER",
       "name": "Version",
-      "value": "27.1.2"
+      "value": "27.1.3"
     },
     {
       "id": "MAXFILESIZE",
diff --git a/etc/ncp.cfg b/etc/ncp.cfg
index 983cd1933..4e83a4d68 100644
--- a/etc/ncp.cfg
+++ b/etc/ncp.cfg
@@ -1,5 +1,5 @@
 {
-	"nextcloud_version": "27.1.2",
+	"nextcloud_version": "27.1.3",
 	"php_version": "8.1",
 	"release": "bullseye"
 }

From c7393b04358f676367e16fb46db038f030d2a5f5 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 10/10] system_tests.py: Add debug output

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

diff --git a/.github/workflows/vm-tests.yml b/.github/workflows/vm-tests.yml
index 907d44e20..e396fb6df 100644
--- a/.github/workflows/vm-tests.yml
+++ b/.github/workflows/vm-tests.yml
@@ -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