Merge pull request #36579 from owncloud/increase-wait-for-db-timeout-600

Increase wait-for-db timeout from 120 to 600 seconds
owncloud · Dec 12, 2019 · cf40428 · cf40428
2 parents 591e3b6 + 8c28672
commit cf40428
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/.drone.starlark b/.drone.starlark
@@ -1887,7 +1887,7 @@ def setupCeph(phpVersion, cephS3):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'commands': [
-			'wait-for-it -t 120 ceph:80',
+			'wait-for-it -t 600 ceph:80',
 			'cd /drone/src/apps/files_primary_s3',
 			'cp tests/drone/ceph.config.php /drone/src/config',
 			'cd /var/www/owncloud/server',
@@ -1912,7 +1912,7 @@ def setupScality(phpVersion, scalityS3):
 		'image': 'owncloudci/php:%s' % phpVersion,
 		'pull': 'always',
 		'commands': [
-			'wait-for-it -t 120 scality:8000',
+			'wait-for-it -t 600 scality:8000',
 			'cp /drone/src/apps/files_primary_s3/tests/drone/%s /drone/src/config' % configFile,
 			'php occ s3:create-bucket owncloud --accept-warning'
 		] + ([

diff --git a/.drone.yml b/.drone.yml
@@ -3555,7 +3555,7 @@ steps:
   pull: always
   image: owncloudci/php:7.1
   commands:
-  - wait-for-it -t 120 scality:8000
+  - wait-for-it -t 600 scality:8000
   - cp /drone/src/apps/files_primary_s3/tests/drone/scality.config.php /drone/src/config
   - php occ s3:create-bucket owncloud --accept-warning
 

diff --git a/tests/drone/install-server.sh b/tests/drone/install-server.sh
@@ -76,23 +76,23 @@ rm -rf ${DATA_DIRECTORY} config/config.php
 echo "waiting for database to be ready"
 case "${DB_TYPE}" in
   mariadb)
-    wait-for-it -t 120 mariadb:3306
+    wait-for-it -t 600 mariadb:3306
     DB=mysql
     ;;
   mysql)
-    wait-for-it -t 120 mysql:3306
+    wait-for-it -t 600 mysql:3306
     DB=mysql
     ;;
   mysql8)
-    wait-for-it -t 120 mysql8:3306
+    wait-for-it -t 600 mysql8:3306
     DB=mysql
     ;;
   postgres)
-    wait-for-it -t 120 postgres:5432
+    wait-for-it -t 600 postgres:5432
     DB=pgsql
     ;;
   oracle)
-    wait-for-it -t 120 oracle:1521
+    wait-for-it -t 600 oracle:1521
     DB=oci
     DB_USERNAME=autotest
     DB_NAME='XE'
@@ -111,7 +111,7 @@ declare -x PRIMARY_OBJECTSTORE
 if [[ ! -z "${PRIMARY_OBJECTSTORE}" ]]; then
   case "${PRIMARY_OBJECTSTORE}" in
     files_primary_s3)
-      wait-for-it -t 120 scality:8000
+      wait-for-it -t 600 scality:8000
       ;;
     *)
       echo "Unknown primary object storage!"

diff --git a/tests/drone/test-phpunit.sh b/tests/drone/test-phpunit.sh
@@ -18,22 +18,22 @@ set_up_external_storage() {
     php occ config:app:set core enable_external_storage --value=yes
     case "${FILES_EXTERNAL_TYPE}" in
     webdav)
-      wait-for-it -t 120 webdav:80
+      wait-for-it -t 600 webdav:80
       cp tests/drone/configs/config.files_external.webdav-apache.php apps/files_external/tests/config.webdav.php
       FILES_EXTERNAL_TEST_TO_RUN=WebdavTest.php
       ;;
     samba)
-      wait-for-it -t 120 samba:445
+      wait-for-it -t 600 samba:445
       cp tests/drone/configs/config.files_external.smb-samba.php apps/files_external/tests/config.smb.php
       FILES_EXTERNAL_TEST_TO_RUN=SmbTest.php
       ;;
     windows)
-      wait-for-it -t 120 fsweb.test.owncloud.com:445
+      wait-for-it -t 600 fsweb.test.owncloud.com:445
       cp tests/drone/configs/config.files_external.smb-windows.php apps/files_external/tests/config.smb.php
       FILES_EXTERNAL_TEST_TO_RUN=SmbTest.php
       ;;
     sftp)
-      wait-for-it -t 120 sftp:22
+      wait-for-it -t 600 sftp:22
       cp tests/drone/configs/config.files_external.sftp.php apps/files_external/tests/config.sftp.php
       FILES_EXTERNAL_TEST_TO_RUN=SftpTest.php
       ;;