diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-16 17:32:55 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-03-16 17:32:55 +0100 |
| commit | b4ea527fb2504a259e59c97b1f5cf77b47dafbe9 (patch) | |
| tree | 5d24ad47510bbeb95ec5adc47c9a60c3e37354b9 | |
| parent | d188ed938cf6c08dab38f1cb11ea7f4014b19364 (diff) | |
| parent | e7e743bdb4a0a5ab1f9cbba65dedfd44ee7495a3 (diff) | |
| download | nextcloud-server-b4ea527fb2504a259e59c97b1f5cf77b47dafbe9.tar.gz nextcloud-server-b4ea527fb2504a259e59c97b1f5cf77b47dafbe9.zip | |
Merge pull request #23253 from owncloud/give-swift-more-time
Give swift 15 seconds after startup
| -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 |