From 6253f33c40b8ee0a49229948f3d7bb0b57c65cf1 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 28 Nov 2019 17:59:50 +0545 Subject: [PATCH] Drop PHP 7.0 from drone CI --- .drone.starlark | 28 +++++---- .drone.yml | 148 ++++++++---------------------------------------- 2 files changed, 36 insertions(+), 140 deletions(-) diff --git a/.drone.starlark b/.drone.starlark index ddaebc2..8821759 100644 --- a/.drone.starlark +++ b/.drone.starlark @@ -12,7 +12,6 @@ config = { 'codestyle': { 'ordinary' : { 'phpVersions': [ - '7.0', '7.1', '7.2', '7.3', @@ -29,12 +28,11 @@ config = { 'phpunit': { 'allDatabases' : { 'phpVersions': [ - '7.0', + '7.1', ] }, 'reducedDatabases' : { 'phpVersions': [ - '7.1', '7.2', '7.3', ], @@ -89,7 +87,7 @@ def codestyle(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], } if 'defaults' in config: @@ -278,7 +276,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: @@ -350,7 +348,7 @@ def build(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'commands': [ 'make dist' ], @@ -475,13 +473,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'] + [ @@ -528,7 +526,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' ], @@ -695,7 +693,7 @@ def acceptance(): default = { 'servers': ['daily-master-qa', 'latest'], 'browsers': ['chrome'], - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'databases': ['mariadb:10.2'], 'federatedServerNeeded': False, 'filterTags': '', @@ -1272,7 +1270,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', @@ -1280,7 +1278,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', @@ -1300,7 +1298,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' @@ -1308,7 +1306,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 3a258f5..092164a 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/files_pdfviewer - -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-sqlite +name: phpunit-php7.1-sqlite platform: os: linux @@ -131,7 +105,7 @@ steps: - name: setup-server-files_pdfviewer 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 @@ -163,7 +137,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -171,7 +144,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-mariadb10.2 +name: phpunit-php7.1-mariadb10.2 platform: os: linux @@ -197,7 +170,7 @@ steps: - name: setup-server-files_pdfviewer pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -209,7 +182,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -239,7 +212,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -247,7 +219,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-mysql5.5 +name: phpunit-php7.1-mysql5.5 platform: os: linux @@ -273,7 +245,7 @@ steps: - name: setup-server-files_pdfviewer pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -285,7 +257,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -315,7 +287,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -323,7 +294,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-mysql5.7 +name: phpunit-php7.1-mysql5.7 platform: os: linux @@ -349,7 +320,7 @@ steps: - name: setup-server-files_pdfviewer pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -361,7 +332,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -391,7 +362,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -399,7 +369,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-postgres9.4 +name: phpunit-php7.1-postgres9.4 platform: os: linux @@ -425,7 +395,7 @@ steps: - name: setup-server-files_pdfviewer pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -437,7 +407,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -466,7 +436,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -474,7 +443,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-oracle +name: phpunit-php7.1-oracle platform: os: linux @@ -500,7 +469,7 @@ steps: - name: setup-server-files_pdfviewer pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -512,7 +481,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -542,74 +511,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/files_pdfviewer - -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/files_pdfviewer - version: daily-master-qa - -- name: setup-server-files_pdfviewer - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e files_pdfviewer - - 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 @@ -676,7 +577,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -743,7 +643,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -778,13 +677,12 @@ trigger: - failure depends_on: -- 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