From 9139a95019265992b8a65dea681dbe17bcb53769 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 28 Nov 2019 21:12:16 +0545 Subject: [PATCH] Drop PHP 7.0 from drone CI --- .drone.starlark | 28 ++++----- .drone.yml | 163 +++++++++--------------------------------------- 2 files changed, 44 insertions(+), 147 deletions(-) diff --git a/.drone.starlark b/.drone.starlark index e7c3c28155e..64b3330277c 100644 --- a/.drone.starlark +++ b/.drone.starlark @@ -12,7 +12,6 @@ config = { 'codestyle': { 'ordinary' : { 'phpVersions': [ - '7.0', '7.1', '7.2', '7.3', @@ -25,7 +24,7 @@ config = { 'phpunit': { 'withCoverage' : { 'phpVersions': [ - '7.0', + '7.1', ], 'databases': [ 'mysql:5.5', @@ -33,7 +32,6 @@ config = { }, 'withoutCoverage' : { 'phpVersions': [ - '7.1', '7.2', '7.3', ], @@ -102,7 +100,7 @@ def codestyle(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], } if 'defaults' in config: @@ -291,7 +289,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: @@ -363,7 +361,7 @@ def build(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'commands': [ 'make dist' ], @@ -488,13 +486,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'] + [ @@ -541,7 +539,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' ], @@ -708,7 +706,7 @@ def acceptance(): default = { 'servers': ['daily-master-qa', 'latest'], 'browsers': ['chrome'], - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'databases': ['mariadb:10.2'], 'federatedServerNeeded': False, 'filterTags': '', @@ -1285,7 +1283,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', @@ -1293,7 +1291,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', @@ -1313,7 +1311,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' @@ -1321,7 +1319,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 4a81341d01b..9e26136331e 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/firstrunwizard - -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 @@ -105,7 +79,7 @@ trigger: --- kind: pipeline type: docker -name: phpunit-php7.0-mysql5.5 +name: phpunit-php7.1-mysql5.5 platform: os: linux @@ -131,7 +105,7 @@ steps: - name: setup-server-firstrunwizard pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -143,7 +117,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -173,74 +147,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 -- coding-standard-php7.1 -- coding-standard-php7.2 -- coding-standard-php7.3 - ---- -kind: pipeline -type: docker -name: phpunit-php7.1-mysql5.5 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: server/apps/firstrunwizard - -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/firstrunwizard - version: daily-master-qa - -- name: setup-server-firstrunwizard - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e firstrunwizard - - 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 @@ -307,7 +213,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -374,7 +279,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -382,7 +286,7 @@ depends_on: --- kind: pipeline type: docker -name: webUIFirstrunwiz-master-chrome-mariadb10.2-php7.0 +name: webUIFirstrunwiz-master-chrome-mariadb10.2-php7.1 platform: os: linux @@ -408,7 +312,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 @@ -419,7 +323,7 @@ steps: - name: setup-server-firstrunwizard pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -438,13 +342,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 @@ -476,7 +380,7 @@ services: - name: server pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 command: - /usr/local/bin/apachectl - -e @@ -493,7 +397,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -501,7 +404,7 @@ depends_on: --- kind: pipeline type: docker -name: webUIFirstrunwiz-master-firefox-mariadb10.2-php7.0 +name: webUIFirstrunwiz-master-firefox-mariadb10.2-php7.1 platform: os: linux @@ -527,7 +430,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 @@ -538,7 +441,7 @@ steps: - name: setup-server-firstrunwizard pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -557,13 +460,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 @@ -596,7 +499,7 @@ services: - name: server pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 command: - /usr/local/bin/apachectl - -e @@ -613,7 +516,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -621,7 +523,7 @@ depends_on: --- kind: pipeline type: docker -name: webUIFirstrunwiz-latest-chrome-mariadb10.2-php7.0 +name: webUIFirstrunwiz-latest-chrome-mariadb10.2-php7.1 platform: os: linux @@ -647,7 +549,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 @@ -658,7 +560,7 @@ steps: - name: setup-server-firstrunwizard pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -677,13 +579,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 @@ -715,7 +617,7 @@ services: - name: server pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 command: - /usr/local/bin/apachectl - -e @@ -732,7 +634,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -740,7 +641,7 @@ depends_on: --- kind: pipeline type: docker -name: webUIFirstrunwiz-latest-firefox-mariadb10.2-php7.0 +name: webUIFirstrunwiz-latest-firefox-mariadb10.2-php7.1 platform: os: linux @@ -766,7 +667,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 @@ -777,7 +678,7 @@ steps: - name: setup-server-firstrunwizard pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -796,13 +697,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 @@ -835,7 +736,7 @@ services: - name: server pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 command: - /usr/local/bin/apachectl - -e @@ -852,7 +753,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -887,13 +787,12 @@ trigger: - failure depends_on: -- phpunit-php7.0-mysql5.5 - phpunit-php7.1-mysql5.5 - phpunit-php7.2-mysql5.5 - phpunit-php7.3-mysql5.5 -- webUIFirstrunwiz-master-chrome-mariadb10.2-php7.0 -- webUIFirstrunwiz-master-firefox-mariadb10.2-php7.0 -- webUIFirstrunwiz-latest-chrome-mariadb10.2-php7.0 -- webUIFirstrunwiz-latest-firefox-mariadb10.2-php7.0 +- webUIFirstrunwiz-master-chrome-mariadb10.2-php7.1 +- webUIFirstrunwiz-master-firefox-mariadb10.2-php7.1 +- webUIFirstrunwiz-latest-chrome-mariadb10.2-php7.1 +- webUIFirstrunwiz-latest-firefox-mariadb10.2-php7.1 ...