Merge pull request #24505 from owncloud/ceph-wait-for-http
Don't rely on the notify socket but on the service responding
This commit is contained in:
commit
755c86e3a2
|
@ -74,6 +74,11 @@ if [[ $ready != 'READY=1' ]]; then
|
||||||
docker logs $container
|
docker logs $container
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
if ! "$thisFolder"/env/wait-for-connection ${host} 80 600; then
|
||||||
|
echo "[ERROR] Waited 600 seconds, no response" >&2
|
||||||
|
docker logs $container
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
echo "Waiting another 15 seconds"
|
echo "Waiting another 15 seconds"
|
||||||
sleep 15
|
sleep 15
|
||||||
|
|
||||||
|
|
|
@ -192,8 +192,8 @@ function execute_tests {
|
||||||
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
||||||
|
|
||||||
echo "Waiting for MySQL initialisation ..."
|
echo "Waiting for MySQL initialisation ..."
|
||||||
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 60; then
|
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
|
||||||
echo "[ERROR] Waited 60 seconds, no response" >&2
|
echo "[ERROR] Waited 600 seconds, no response" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -221,8 +221,8 @@ function execute_tests {
|
||||||
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
DATABASEHOST=$(docker inspect --format="{{.NetworkSettings.IPAddress}}" "$DOCKER_CONTAINER_ID")
|
||||||
|
|
||||||
echo "Waiting for MariaDB initialisation ..."
|
echo "Waiting for MariaDB initialisation ..."
|
||||||
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 60; then
|
if ! apps/files_external/tests/env/wait-for-connection $DATABASEHOST 3306 600; then
|
||||||
echo "[ERROR] Waited 60 seconds, no response" >&2
|
echo "[ERROR] Waited 600 seconds, no response" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue