Make sure to expose exact same passive port range. Local tests tend to fail

if not done like that.
Added a bit more robustness in the test scripts to not fail so easily if
services are not fully initialized yet when make test is run e.g. from CI.

Author: jonasbardino

docker-compose_development.yml

@@ -274,7 +274,7 @@ services:
       # NOTE: compose does not support shell-style replacement so we can't use
       #- "${FTPS_PASV_PORTS/:/-}:${FTPS_PASV_PORTS/:/-}"
       # hard-code them for now.
-      - "8100-8399"
+      - "8100-8399:8100-8399"
     networks:
       default:
         aliases:

docker-compose_development_gdp.yml

@@ -278,7 +278,7 @@ services:
       # NOTE: compose does not support shell-style replacement so we can't use
       #- "${FTPS_PASV_PORTS/:/-}:${FTPS_PASV_PORTS/:/-}"
       # hard-code them for now.
-      - "8100-8399"
+      - "8100-8399:8100-8399"
     networks:
       default:
         aliases:

tests/test-10-migrid-https-frontpage.sh

@@ -4,7 +4,8 @@ source default
 
 ${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
   --connect-timeout 1 \
-  --retry 1 \
+  --retry-connrefused \
+  --retry 3 \
   https://${DOMAIN}:${PUBLIC_HTTPS_PORT} \
   -k \
   -s \

tests/test-11-migrid-https-migoid-public.sh

@@ -4,7 +4,8 @@ source default
 
 ${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
   --connect-timeout 1 \
-  --retry 1 \
+  --retry-connrefused \
+  --retry 3 \
   https://${MIGOID_DOMAIN}:${PUBLIC_HTTPS_PORT}/public/index.html \
   -k \
   -s \

tests/test-12-migrid-https-sid-login-page.sh

@@ -4,7 +4,8 @@ source default
 
 ${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
   --connect-timeout 1 \
-  --retry 1 \
+  --retry-connrefused \
+  --retry 3 \
   https://${SID_DOMAIN}:${SID_HTTPS_PORT}/cgi-sid/login.py \
   -k \
   -s \

tests/test-14-migrid-https-migoid-login-page.sh

@@ -4,7 +4,8 @@ source default
 
 ${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
   --connect-timeout 1 \
-  --retry 1 \
+  --retry-connrefused \
+  --retry 3 \
   https://${OPENID_DOMAIN}:${OPENID_PORT}/openid/login \
   -k \
   -s \

tests/test-16-migrid-https-migoid-login-submit.sh

@@ -4,7 +4,8 @@ source default
 
 ${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
   --connect-timeout 1 \
-  --retry 1 \
+  --retry-connrefused \
+  --retry 3 \
   --data-urlencode user=${MIG_TEST_USER} \
   --data-urlencode password=${MIG_TEST_USER_PASSWORD} \
   --data-urlencode success_to=/openid/id/ \

tests/test-20-migrid-webdavs-read.sh

@@ -4,7 +4,8 @@ source default
 
 ${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
   --connect-timeout 1 \
-  --retry 1 \
+  --retry-connrefused \
+  --retry 3 \
   --user "${MIG_TEST_USER}:${MIG_TEST_USER_PASSWORD}" \
   https://${WEBDAVS_DOMAIN}:${DAVS_PORT}/welcome.txt \
   -k \

tests/test-30-migrid-sftp-read.sh

@@ -4,7 +4,8 @@ source default
 
 ${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
   --connect-timeout 1 \
-  --retry 1 \
+  --retry-connrefused \
+  --retry 3 \
   --user "${MIG_TEST_USER}:${MIG_TEST_USER_PASSWORD}" \
   sftp://${SFTP_DOMAIN}:${SFTP_PORT}/welcome.txt \
   -k \

tests/test-31-migrid-sftpsubsys-read.sh

@@ -4,7 +4,8 @@ source default
 
 ${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
   --connect-timeout 1 \
-  --retry 1 \
+  --retry-connrefused \
+  --retry 3 \
   --user "${MIG_TEST_USER}:${MIG_TEST_USER_PASSWORD}" \
   sftp://${SFTP_DOMAIN}:${SFTP_SUBSYS_PORT}/welcome.txt \
   -k \

tests/test-40-migrid-ftps-read.sh

@@ -4,7 +4,8 @@ source default
 
 ${DOCKER:?} run --rm --network host --dns 127.0.0.1 curlimages/curl:8.7.1 \
   --connect-timeout 1 \
-  --retry 1 \
+  --retry-connrefused \
+  --retry 3 \
   --user "${MIG_TEST_USER}:${MIG_TEST_USER_PASSWORD}" \
   ftp://${FTPS_DOMAIN}:${FTPS_CTRL_PORT}/welcome.txt \
   --ssl-reqd \