diff --git a/.drone.starlark b/.drone.starlark index dc232de..0a51be3 100644 --- a/.drone.starlark +++ b/.drone.starlark @@ -12,7 +12,6 @@ config = { 'codestyle': { 'ordinary' : { 'phpVersions': [ - '7.0', '7.1', '7.2', '7.3', @@ -36,13 +35,12 @@ config = { 'phpunit': { 'allDatabases' : { 'phpVersions': [ - '7.0', + '7.1', ], 'coverage': False }, 'reducedDatabases' : { 'phpVersions': [ - '7.1', '7.2', '7.3', ], @@ -59,9 +57,9 @@ config = { 'apiTestingApp', ], 'phpVersions': [ - '7.0', '7.1', '7.2', + '7.3', ], }, }, @@ -108,7 +106,7 @@ def codestyle(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], } if 'defaults' in config: @@ -297,7 +295,7 @@ def phan(): return pipelines default = { - 'phpVersions': ['7.0', '7.1', '7.2', '7.3'], + 'phpVersions': ['7.1', '7.2', '7.3'], } if 'defaults' in config: @@ -369,7 +367,7 @@ def build(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'commands': [ 'make dist' ], @@ -494,13 +492,13 @@ def javascript(): }, 'steps': installCore('daily-master-qa', 'sqlite', False) + - installApp('7.0') + - setupServerAndApp('7.0', params['logLevel']) + + installApp('7.1') + + setupServerAndApp('7.1', params['logLevel']) + params['extraSetup'] + [ { 'name': 'js-tests', - 'image': 'owncloudci/php:7.0', + 'image': 'owncloudci/php:7.1', 'pull': 'always', 'environment': params['extraEnvironment'], 'commands': params['extraCommandsBeforeTestRun'] + [ @@ -547,7 +545,7 @@ def phptests(testType): errorFound = False default = { - 'phpVersions': ['7.0', '7.1', '7.2', '7.3'], + 'phpVersions': ['7.1', '7.2', '7.3'], 'databases': [ 'sqlite', 'mariadb:10.2', 'mysql:5.5', 'mysql:5.7', 'postgres:9.4', 'oracle' ], @@ -714,7 +712,7 @@ def acceptance(): default = { 'servers': ['daily-master-qa', 'latest'], 'browsers': ['chrome'], - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'databases': ['mariadb:10.2'], 'federatedServerNeeded': False, 'filterTags': '', @@ -1291,7 +1289,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 60 ceph:80', + 'wait-for-it -t 120 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', @@ -1299,7 +1297,7 @@ def setupCeph(serviceParams): return [{ 'name': 'setup-ceph', - 'image': 'owncloudci/php:7.0', + 'image': 'owncloudci/php:7.1', 'pull': 'always', 'commands': setupCommands + ([ './apps/files_primary_s3/tests/drone/create-bucket.sh', @@ -1319,7 +1317,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 60 scality:8000', + 'wait-for-it -t 120 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' @@ -1327,7 +1325,7 @@ def setupScality(serviceParams): return [{ 'name': 'setup-scality', - 'image': 'owncloudci/php:7.0', + 'image': 'owncloudci/php:7.1', 'pull': 'always', 'commands': setupCommands + ([ 'php occ s3:create-bucket owncloud --accept-warning' diff --git a/.drone.yml b/.drone.yml index b40d489..17d5b13 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,29 +1,3 @@ ---- -kind: pipeline -type: docker -name: coding-standard-php7.0 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: server/apps/testing - -steps: -- name: coding-standard - pull: always - image: owncloudci/php:7.0 - commands: - - make test-php-style - -trigger: - ref: - - refs/pull/** - - refs/tags/** - - refs/heads/master - --- kind: pipeline type: docker @@ -195,7 +169,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -204,7 +177,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-sqlite +name: phpunit-php7.1-sqlite platform: os: linux @@ -230,7 +203,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -242,7 +215,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit @@ -253,7 +226,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -262,7 +234,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-mariadb10.2 +name: phpunit-php7.1-mariadb10.2 platform: os: linux @@ -288,7 +260,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -300,7 +272,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit @@ -321,7 +293,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -330,7 +301,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-mysql5.5 +name: phpunit-php7.1-mysql5.5 platform: os: linux @@ -356,7 +327,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -368,7 +339,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit @@ -389,7 +360,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -398,7 +368,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-mysql5.7 +name: phpunit-php7.1-mysql5.7 platform: os: linux @@ -424,7 +394,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -436,7 +406,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit @@ -457,7 +427,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -466,7 +435,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-postgres9.4 +name: phpunit-php7.1-postgres9.4 platform: os: linux @@ -492,7 +461,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -504,7 +473,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit @@ -524,7 +493,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -533,7 +501,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-oracle +name: phpunit-php7.1-oracle platform: os: linux @@ -559,7 +527,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -571,7 +539,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit @@ -592,75 +560,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 -- coding-standard-php7.1 -- coding-standard-php7.2 -- coding-standard-php7.3 -- phpstan-php7.2 - ---- -kind: pipeline -type: docker -name: phpunit-php7.1-mysql5.5 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: server/apps/testing - -steps: -- name: install-core - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/server - db_host: mysql - db_name: owncloud - db_password: owncloud - db_type: mysql - db_username: owncloud - exclude: apps/testing - version: daily-master-qa - -- name: setup-server-testing - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e testing - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=server - - php occ log:manage --level 2 - -- name: phpunit-tests - pull: always - image: owncloudci/php:7.1 - commands: - - make test-php-unit - -services: -- name: mysql - pull: always - image: mysql:5.5 - environment: - MYSQL_DATABASE: owncloud - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - -trigger: - ref: - - refs/pull/** - - refs/tags/** - - refs/heads/master - -depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -728,7 +627,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -796,7 +694,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -805,7 +702,7 @@ depends_on: --- kind: pipeline type: docker -name: apiTestingApp-master-mariadb10.2-php7.0 +name: apiTestingApp-master-mariadb10.2-php7.1 platform: os: linux @@ -831,7 +728,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -842,7 +739,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -861,13 +758,13 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh @@ -888,7 +785,7 @@ services: - name: server pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 command: - /usr/local/bin/apachectl - -e @@ -905,7 +802,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -914,7 +810,7 @@ depends_on: --- kind: pipeline type: docker -name: apiTestingApp-master-mariadb10.2-php7.1 +name: apiTestingApp-master-mariadb10.2-php7.2 platform: os: linux @@ -940,7 +836,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -951,7 +847,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 commands: - cd /var/www/owncloud/server - php occ a:l @@ -970,13 +866,13 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh @@ -997,7 +893,7 @@ services: - name: server pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 command: - /usr/local/bin/apachectl - -e @@ -1014,7 +910,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1023,7 +918,7 @@ depends_on: --- kind: pipeline type: docker -name: apiTestingApp-master-mariadb10.2-php7.2 +name: apiTestingApp-master-mariadb10.2-php7.3 platform: os: linux @@ -1049,7 +944,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1060,7 +955,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1079,13 +974,13 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh @@ -1106,7 +1001,7 @@ services: - name: server pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 command: - /usr/local/bin/apachectl - -e @@ -1123,7 +1018,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1132,7 +1026,7 @@ depends_on: --- kind: pipeline type: docker -name: apiTestingApp-latest-mariadb10.2-php7.0 +name: apiTestingApp-latest-mariadb10.2-php7.1 platform: os: linux @@ -1158,7 +1052,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1169,7 +1063,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1188,13 +1082,13 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh @@ -1215,7 +1109,7 @@ services: - name: server pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 command: - /usr/local/bin/apachectl - -e @@ -1232,7 +1126,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1241,7 +1134,7 @@ depends_on: --- kind: pipeline type: docker -name: apiTestingApp-latest-mariadb10.2-php7.1 +name: apiTestingApp-latest-mariadb10.2-php7.2 platform: os: linux @@ -1267,7 +1160,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1278,7 +1171,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1297,13 +1190,13 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh @@ -1324,7 +1217,7 @@ services: - name: server pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 command: - /usr/local/bin/apachectl - -e @@ -1341,7 +1234,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1350,7 +1242,7 @@ depends_on: --- kind: pipeline type: docker -name: apiTestingApp-latest-mariadb10.2-php7.2 +name: apiTestingApp-latest-mariadb10.2-php7.3 platform: os: linux @@ -1376,7 +1268,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1387,7 +1279,7 @@ steps: - name: setup-server-testing pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1406,13 +1298,13 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh @@ -1433,7 +1325,7 @@ services: - name: server pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 command: - /usr/local/bin/apachectl - -e @@ -1450,7 +1342,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1487,20 +1378,19 @@ trigger: depends_on: - build -- phpunit-php7.0-sqlite -- phpunit-php7.0-mariadb10.2 -- phpunit-php7.0-mysql5.5 -- phpunit-php7.0-mysql5.7 -- phpunit-php7.0-postgres9.4 -- phpunit-php7.0-oracle +- phpunit-php7.1-sqlite +- phpunit-php7.1-mariadb10.2 - phpunit-php7.1-mysql5.5 +- phpunit-php7.1-mysql5.7 +- phpunit-php7.1-postgres9.4 +- phpunit-php7.1-oracle - phpunit-php7.2-mysql5.5 - phpunit-php7.3-mysql5.5 -- apiTestingApp-master-mariadb10.2-php7.0 - apiTestingApp-master-mariadb10.2-php7.1 - apiTestingApp-master-mariadb10.2-php7.2 -- apiTestingApp-latest-mariadb10.2-php7.0 +- apiTestingApp-master-mariadb10.2-php7.3 - apiTestingApp-latest-mariadb10.2-php7.1 - apiTestingApp-latest-mariadb10.2-php7.2 +- apiTestingApp-latest-mariadb10.2-php7.3 ...