diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-03-15 13:01:47 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-03-16 16:16:04 +0100 |
| commit | e7e743bdb4a0a5ab1f9cbba65dedfd44ee7495a3 (patch) | |
| tree | 559abab6cebb4add7e7ccf14ac431b041793d193 /apps/files_external | |
| parent | 2f5b929ee9bccc381455ab1034748c556c172fcc (diff) | |
| download | nextcloud-server-e7e743bdb4a0a5ab1f9cbba65dedfd44ee7495a3.tar.gz nextcloud-server-e7e743bdb4a0a5ab1f9cbba65dedfd44ee7495a3.zip | |
Give swift 15 seconds after startup
Diffstat (limited to 'apps/files_external')
| -rwxr-xr-x | apps/files_external/tests/env/start-swift-ceph.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_external/tests/env/start-swift-ceph.sh b/apps/files_external/tests/env/start-swift-ceph.sh index 357512ae4d6..e884087c248 100755 --- a/apps/files_external/tests/env/start-swift-ceph.sh +++ b/apps/files_external/tests/env/start-swift-ceph.sh @@ -63,14 +63,15 @@ echo "${docker_image} container: $container" # put container IDs into a file to drop them after the test run (keep in mind that multiple tests run in parallel on the same host) echo $container >> $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift -echo -n "Waiting for ceph initialization" +echo "Waiting for ceph initialization" ready=$(timeout 600 cat "$notify_sock") if [[ $ready != 'READY=1' ]]; then echo "[ERROR] Waited 600 seconds, no response" >&2 docker logs $container exit 1 fi -sleep 1 +echo "Waiting another 15 seconds" +sleep 15 cat > $thisFolder/config.swift.php <<DELIM <?php |