From 0e1c473da97ca3609cf9d0cc31e21c70ce967618 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 28 Nov 2019 21:24:57 +0545 Subject: [PATCH] Drop PHP 7.0 from drone CI --- .drone.starlark | 31 +++--- .drone.yml | 275 +++++++++--------------------------------------- 2 files changed, 62 insertions(+), 244 deletions(-) diff --git a/.drone.starlark b/.drone.starlark index b6c7be8f..45cf75bc 100644 --- a/.drone.starlark +++ b/.drone.starlark @@ -12,7 +12,6 @@ config = { 'codestyle': { 'ordinary' : { 'phpVersions': [ - '7.0', '7.1', '7.2', '7.3', @@ -25,12 +24,11 @@ config = { 'phpunit': { 'allDatabases' : { 'phpVersions': [ - '7.0', + '7.1', ] }, 'reducedDatabases' : { 'phpVersions': [ - '7.1', '7.2', '7.3', ], @@ -44,12 +42,11 @@ config = { 'phpintegration': { 'allDatabases' : { 'phpVersions': [ - '7.0', + '7.1', ] }, 'reducedDatabases' : { 'phpVersions': [ - '7.1', '7.2', '7.3', ], @@ -104,7 +101,7 @@ def codestyle(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], } if 'defaults' in config: @@ -293,7 +290,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: @@ -365,7 +362,7 @@ def build(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'commands': [ 'make dist' ], @@ -490,13 +487,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'] + [ @@ -543,7 +540,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' ], @@ -710,7 +707,7 @@ def acceptance(): default = { 'servers': ['daily-master-qa', 'latest'], 'browsers': ['chrome'], - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'databases': ['mariadb:10.2'], 'federatedServerNeeded': False, 'filterTags': '', @@ -1287,7 +1284,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', @@ -1295,7 +1292,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', @@ -1315,7 +1312,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' @@ -1323,7 +1320,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 0f622332..dfa7cfc4 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/notes - -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 @@ -131,7 +105,7 @@ steps: - name: setup-server-notes 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: js-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-js @@ -154,7 +128,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -162,7 +135,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-sqlite +name: phpunit-php7.1-sqlite platform: os: linux @@ -188,7 +161,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -200,7 +173,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -220,7 +193,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -228,7 +200,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-mariadb10.2 +name: phpunit-php7.1-mariadb10.2 platform: os: linux @@ -254,7 +226,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -266,7 +238,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -296,7 +268,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -304,7 +275,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-mysql5.5 +name: phpunit-php7.1-mysql5.5 platform: os: linux @@ -330,7 +301,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -342,7 +313,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -372,7 +343,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -380,7 +350,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-mysql5.7 +name: phpunit-php7.1-mysql5.7 platform: os: linux @@ -406,7 +376,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -418,7 +388,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -448,7 +418,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -456,7 +425,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-postgres9.4 +name: phpunit-php7.1-postgres9.4 platform: os: linux @@ -482,7 +451,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -494,7 +463,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -523,7 +492,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -531,7 +499,7 @@ depends_on: --- kind: pipeline type: docker -name: phpunit-php7.0-oracle +name: phpunit-php7.1-oracle platform: os: linux @@ -557,7 +525,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -569,7 +537,7 @@ steps: - name: phpunit-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-unit-dbg @@ -599,74 +567,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/notes - -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/notes - version: daily-master-qa - -- name: setup-server-notes - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e notes - - 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 @@ -733,7 +633,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -800,7 +699,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -808,7 +706,7 @@ depends_on: --- kind: pipeline type: docker -name: phpintegration-php7.0-sqlite +name: phpintegration-php7.1-sqlite platform: os: linux @@ -834,7 +732,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -846,7 +744,7 @@ steps: - name: phpintegration-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-integration-dbg @@ -866,7 +764,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -874,7 +771,7 @@ depends_on: --- kind: pipeline type: docker -name: phpintegration-php7.0-mariadb10.2 +name: phpintegration-php7.1-mariadb10.2 platform: os: linux @@ -900,7 +797,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -912,7 +809,7 @@ steps: - name: phpintegration-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-integration-dbg @@ -942,7 +839,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -950,7 +846,7 @@ depends_on: --- kind: pipeline type: docker -name: phpintegration-php7.0-mysql5.5 +name: phpintegration-php7.1-mysql5.5 platform: os: linux @@ -976,7 +872,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -988,7 +884,7 @@ steps: - name: phpintegration-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-integration-dbg @@ -1018,7 +914,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1026,7 +921,7 @@ depends_on: --- kind: pipeline type: docker -name: phpintegration-php7.0-mysql5.7 +name: phpintegration-php7.1-mysql5.7 platform: os: linux @@ -1052,7 +947,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1064,7 +959,7 @@ steps: - name: phpintegration-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-integration-dbg @@ -1094,7 +989,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1102,7 +996,7 @@ depends_on: --- kind: pipeline type: docker -name: phpintegration-php7.0-postgres9.4 +name: phpintegration-php7.1-postgres9.4 platform: os: linux @@ -1128,7 +1022,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1140,7 +1034,7 @@ steps: - name: phpintegration-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-integration-dbg @@ -1169,7 +1063,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1177,7 +1070,7 @@ depends_on: --- kind: pipeline type: docker -name: phpintegration-php7.0-oracle +name: phpintegration-php7.1-oracle platform: os: linux @@ -1203,7 +1096,7 @@ steps: - name: setup-server-notes pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1215,7 +1108,7 @@ steps: - name: phpintegration-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - make test-php-integration-dbg @@ -1245,74 +1138,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: phpintegration-php7.1-mysql5.5 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: server/apps/notes - -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/notes - version: daily-master-qa - -- name: setup-server-notes - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e notes - - 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: phpintegration-tests - pull: always - image: owncloudci/php:7.1 - commands: - - make test-php-integration - -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 @@ -1379,7 +1204,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1446,7 +1270,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1482,22 +1305,20 @@ trigger: depends_on: - javascript-tests -- 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 -- phpintegration-php7.0-sqlite -- phpintegration-php7.0-mariadb10.2 -- phpintegration-php7.0-mysql5.5 -- phpintegration-php7.0-mysql5.7 -- phpintegration-php7.0-postgres9.4 -- phpintegration-php7.0-oracle +- phpintegration-php7.1-sqlite +- phpintegration-php7.1-mariadb10.2 - phpintegration-php7.1-mysql5.5 +- phpintegration-php7.1-mysql5.7 +- phpintegration-php7.1-postgres9.4 +- phpintegration-php7.1-oracle - phpintegration-php7.2-mysql5.5 - phpintegration-php7.3-mysql5.5