diff --git a/.drone.starlark b/.drone.starlark index c97af1f..1fba89a 100644 --- a/.drone.starlark +++ b/.drone.starlark @@ -1201,10 +1201,7 @@ def installTestrunner(phpVersion, useBundledApp): 'rsync -aIX /tmp/testrunner /var/www/owncloud', ] + ([ 'cp -r /var/www/owncloud/testrunner/apps/%s /var/www/owncloud/server/apps/' % config['app'] - ] if not useBundledApp else []) + [ - 'cd /var/www/owncloud/testrunner', - 'make install-composer-deps' - ] + ] if not useBundledApp else []) }] def installExtraApps(phpVersion, extraApps): @@ -1270,7 +1267,7 @@ def setupCeph(serviceParams): createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [ - 'wait-for-it -t 120 ceph:80', + 'wait-for-it -t 600 ceph:80', 'cd /var/www/owncloud/server/apps/files_primary_s3', 'cp tests/drone/ceph.config.php /var/www/owncloud/server/config', 'cd /var/www/owncloud/server', @@ -1298,7 +1295,7 @@ def setupScality(serviceParams): createFirstBucket = serviceParams['createFirstBucket'] if 'createFirstBucket' in serviceParams else True createExtraBuckets = serviceParams['createExtraBuckets'] if 'createExtraBuckets' in serviceParams else False setupCommands = serviceParams['setupCommands'] if 'setupCommands' in serviceParams else [ - 'wait-for-it -t 120 scality:8000', + 'wait-for-it -t 600 scality:8000', 'cd /var/www/owncloud/server/apps/files_primary_s3', 'cp tests/drone/%s /var/www/owncloud/server/config' % configFile, 'cd /var/www/owncloud/server' diff --git a/vendor-bin/owncloud-codestyle/composer.json b/vendor-bin/owncloud-codestyle/composer.json index da455d6..359fdc0 100644 --- a/vendor-bin/owncloud-codestyle/composer.json +++ b/vendor-bin/owncloud-codestyle/composer.json @@ -1,6 +1,6 @@ { "require": { - "owncloud/coding-standard": "^1.0" + "owncloud/coding-standard": "^2.0" } } \ No newline at end of file