build-docker.yml, build-sd-images.yml: Increase retries and timeouts during tests

Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>
Signed-off-by: Tobias Knöppler <6317548+theCalcaholic@users.noreply.github.com>

Author: theCalcaholic

.github/workflows/build-docker.yml

@@ -157,7 +157,7 @@ jobs:
           docker logs -f nextcloudpi                                 |& awk "{ print \"${LOG_DCKR} \" \$0 }" &
           docker exec nextcloudpi bash -c 'tail -f /var/log/ncp.log' |& awk "{ print \"${LOG_NCP} \" \$0 }" &
           cmd=(python activation_tests.py --no-gui localhost 8443 4443)
-          [[ "${ARCH?}" == "x86" ]] || { sleep 30; cmd+=(--timeout 300); }
+          [[ "${ARCH?}" == "x86" ]] || { sleep 60; cmd+=(--timeout 300); }
           
           success=false
           for attempt in {1..5}
@@ -195,7 +195,7 @@ jobs:
           echo -e "${LOG_DCKR} =========="
           docker logs -f nextcloudpi                                 |& awk "{ print \"${LOG_DCKR} \" \$0 }" &
           docker exec nextcloudpi bash -c 'tail -f /var/log/ncp.log' |& awk "{ print \"${LOG_NCP} \" \$0 }" &
-          [[ "${ARCH?}" == "x86" ]] || sleep 120
+          [[ "${ARCH?}" == "x86" ]] || sleep 240
           
           sleep 20
                     
@@ -294,7 +294,7 @@ jobs:
           docker logs -f nextcloudpi                                 |& awk "{ print \"${LOG_DCKR} \" \$0 }" &
           docker exec nextcloudpi bash -c 'tail -f /var/log/ncp.log' |& awk "{ print \"${LOG_NCP} \" \$0 }" &
           cmd=(python activation_tests.py --no-gui localhost 8443 4443)
-          [[ "${ARCH?}" == "x86" ]] || cmd+=(--timeout 300)
+          [[ "${ARCH?}" == "x86" ]] || { sleep 60; cmd+=(--timeout 300); }
           
           success=false
           for attempt in {1..5}
@@ -324,7 +324,7 @@ jobs:
             python system_tests.py --no-ping --non-interactive       |& awk "{ print \"${LOG_TEST} \" \$0 }" 
             [[ ${PIPESTATUS[0]} -eq 0 ]] || {
               echo -e "${LOG_CICD} System test (attempt $attempt) failed!"
-              sleep 5
+              sleep 12
               continue
             }
             success=true
@@ -344,7 +344,7 @@ jobs:
             [[ ${PIPESTATUS[0]} -eq 0 ]] || {
               tail -n 20 geckodriver.log >&2                         |& awk "{ print \"${LOG_DIAG} \" \$0 }" || true
               echo -e "${LOG_CICD} Nextcloud test (attempt $attempt/3) failed!"
-              sleep 5
+              sleep 12
               continue
             }
             success=true

.github/workflows/build-sd-images.yml

@@ -201,9 +201,9 @@ jobs:
           }
           
           success=false
-          for attempt in {1..3}
+          for attempt in {1..5}
           do
-            echo ":: Activation Tests (attempt $attempt/3) ::"
+            echo ":: Activation Tests (attempt $attempt/5) ::"
             python tests/activation_tests.py -t 300 --no-gui "$ip" 443 4443 || {
               echo "Activation test failed!"
               echo "Geckodriver logs:"
@@ -212,7 +212,7 @@ jobs:
               echo "mysql: "
               sudo systemd-run --wait -P --machine=ncp bash /usr/local/bin/ncp-diag
               sudo systemd-run --wait -P --machine=ncp systemctl status mysql
-              sleep 6
+              sleep 12
               continue
             }
             success=true
@@ -224,12 +224,12 @@ jobs:
           }
           
           success=false
-          for attempt in {1..3}
+          for attempt in {1..5}
           do
-            echo ":: System Tests (attempt $attempt/3) ::"
+            echo ":: System Tests (attempt $attempt/5) ::"
             sudo python tests/system_tests.py --non-interactive || {
               echo "System test failed!"
-              sleep 6
+              sleep 12
               continue
             }
             success=true
@@ -241,17 +241,17 @@ jobs:
           }
           
           success=false
-          for attempt in {1..3}
+          for attempt in {1..5}
           do
-            echo ":: Nextcloud Tests (attempt $attempt/3) ::"
+            echo ":: Nextcloud Tests (attempt $attempt/5) ::"
             python tests/nextcloud_tests.py --no-gui "$ip" 443 4443 || {
               echo "Nextcloud test failed!"
               echo "Geckodriver logs:"
               tail -n 20 geckodriver.log >&2 || true
               echo "================"
               echo "ncp.log: "
               sudo systemd-run --wait -P --machine=ncp ncp /bin/bash -c "tail -n20 /var/log/ncp.log" || true
-              sleep 6
+              sleep 12
               continue
             }
             success=true

bin/ncp-restore

@@ -88,6 +88,7 @@ CREATE USER '$DBADMIN'@'localhost' IDENTIFIED BY '$DBPASSWD';
 GRANT ALL PRIVILEGES ON nextcloud.* TO $DBADMIN@localhost;
 EXIT
 EOFMYSQL
+# shellcheck disable=SC2181
 [ $? -ne 0 ] && { echo "Error configuring nextcloud database"; exit 1; }
 
 mysql -u root nextcloud <  "$TMPDIR"/nextcloud-sqlbkp_*.bak || { echo "Error restoring nextcloud database"; exit 1; }
@@ -157,9 +158,9 @@ install_template "php/opcache.ini.sh" "/etc/php/${PHPVER}/mods-available/opcache
 mkdir -p "$DATADIR/tmp"
 chown www-data: "$DATADIR/tmp"
 ncc config:system:set tempdirectory --value "$DATADIR/tmp"
-sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR/tmp|" /etc/php/${PHPVER}/cli/php.ini
-sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR/tmp|" /etc/php/${PHPVER}/fpm/php.ini
-sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $DATADIR/tmp|"     /etc/php/${PHPVER}/fpm/php.ini
+sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR/tmp|" "/etc/php/${PHPVER}/cli/php.ini"
+sed -i "s|^;\?upload_tmp_dir =.*$|upload_tmp_dir = $DATADIR/tmp|" "/etc/php/${PHPVER}/fpm/php.ini"
+sed -i "s|^;\?sys_temp_dir =.*$|sys_temp_dir = $DATADIR/tmp|"     "/etc/php/${PHPVER}/fpm/php.ini"
 
 # logs
 ncc config:system:set logfile --value="$DATADIR/nextcloud.log"
@@ -183,4 +184,4 @@ ncc files:scan-app-data
 [[ "$NEED_RESTART" == "1" ]] && {
   clear_opcache
   bash -c "sleep 3; service php${PHPVER}-fpm restart" &>/dev/null &
-}
+}