diff --git a/.drone.starlark b/.drone.starlark index 49e9cf9fe..9425e77ff 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', ], @@ -47,7 +45,6 @@ config = { 'webUISecureView': 'webUISecV', }, 'phpVersions': [ - '7.0', '7.1', '7.2', '7.3', @@ -110,7 +107,7 @@ def codestyle(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], } if 'defaults' in config: @@ -299,7 +296,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: @@ -371,7 +368,7 @@ def build(): return pipelines default = { - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'commands': [ 'make dist' ], @@ -496,13 +493,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'] + [ @@ -549,7 +546,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' ], @@ -716,7 +713,7 @@ def acceptance(): default = { 'servers': ['daily-master-qa', 'latest'], 'browsers': ['chrome'], - 'phpVersions': ['7.0'], + 'phpVersions': ['7.1'], 'databases': ['mariadb:10.2'], 'federatedServerNeeded': False, 'filterTags': '', @@ -1293,7 +1290,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', @@ -1301,7 +1298,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', @@ -1321,7 +1318,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' @@ -1329,7 +1326,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 51c84b914..30de3f5c7 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/richdocuments - -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-richdocuments 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-richdocuments 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-richdocuments 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-richdocuments 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-richdocuments 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-richdocuments 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/richdocuments - -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/richdocuments - version: daily-master-qa - -- name: setup-server-richdocuments - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e richdocuments - - 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 @@ -751,7 +650,7 @@ depends_on: --- kind: pipeline type: docker -name: webUISecV-master-chrome-mariadb10.2-php7.0 +name: webUISecV-master-chrome-mariadb10.2-php7.1 platform: os: linux @@ -777,7 +676,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 @@ -788,7 +687,7 @@ steps: - name: setup-server-richdocuments pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -807,13 +706,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 @@ -844,7 +743,7 @@ services: - name: server pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.1 command: - /usr/local/bin/apachectl - -e @@ -861,7 +760,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -869,7 +767,7 @@ depends_on: --- kind: pipeline type: docker -name: webUISecV-master-chrome-mariadb10.2-php7.1 +name: webUISecV-master-chrome-mariadb10.2-php7.2 platform: os: linux @@ -895,7 +793,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 @@ -906,7 +804,7 @@ steps: - name: setup-server-richdocuments pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 commands: - cd /var/www/owncloud/server - php occ a:l @@ -925,13 +823,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 @@ -962,7 +860,7 @@ services: - name: server pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.2 command: - /usr/local/bin/apachectl - -e @@ -979,7 +877,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -987,7 +884,7 @@ depends_on: --- kind: pipeline type: docker -name: webUISecV-master-chrome-mariadb10.2-php7.2 +name: webUISecV-master-chrome-mariadb10.2-php7.3 platform: os: linux @@ -1013,7 +910,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 @@ -1024,7 +921,7 @@ steps: - name: setup-server-richdocuments pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1043,13 +940,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 @@ -1080,7 +977,7 @@ services: - name: server pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.3 command: - /usr/local/bin/apachectl - -e @@ -1097,7 +994,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1105,7 +1001,7 @@ depends_on: --- kind: pipeline type: docker -name: webUISecV-master-chrome-mariadb10.2-php7.3 +name: webUISecV-master-firefox-mariadb10.2-php7.1 platform: os: linux @@ -1131,7 +1027,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.1 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1142,7 +1038,7 @@ steps: - name: setup-server-richdocuments pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1161,20 +1057,20 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.1 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.1 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh - make test-acceptance-webui environment: BEHAT_SUITE: webUISecureView - BROWSER: chrome + BROWSER: firefox PLATFORM: Linux SELENIUM_HOST: selenium SELENIUM_PORT: 4444 @@ -1192,13 +1088,14 @@ services: - name: selenium pull: always - image: selenium/standalone-chrome-debug:3.141.59-oxygen + image: selenium/standalone-firefox-debug:3.8.1 environment: JAVA_OPTS: -Dselenium.LOGGER.level=WARNING + SE_OPTS: -enablePassThrough false - name: server pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.1 command: - /usr/local/bin/apachectl - -e @@ -1215,7 +1112,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1223,7 +1119,7 @@ depends_on: --- kind: pipeline type: docker -name: webUISecV-master-firefox-mariadb10.2-php7.0 +name: webUISecV-master-firefox-mariadb10.2-php7.2 platform: os: linux @@ -1249,7 +1145,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.2 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1260,7 +1156,7 @@ steps: - name: setup-server-richdocuments pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.2 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1279,13 +1175,13 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.2 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.2 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh @@ -1317,7 +1213,7 @@ services: - name: server pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.2 command: - /usr/local/bin/apachectl - -e @@ -1334,7 +1230,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1342,7 +1237,7 @@ depends_on: --- kind: pipeline type: docker -name: webUISecV-master-firefox-mariadb10.2-php7.1 +name: webUISecV-master-firefox-mariadb10.2-php7.3 platform: os: linux @@ -1368,7 +1263,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.3 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1379,7 +1274,7 @@ steps: - name: setup-server-richdocuments pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.3 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1398,13 +1293,13 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.3 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.3 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh @@ -1436,7 +1331,7 @@ services: - name: server pull: always - image: owncloudci/php:7.1 + image: owncloudci/php:7.3 command: - /usr/local/bin/apachectl - -e @@ -1453,7 +1348,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1461,7 +1355,7 @@ depends_on: --- kind: pipeline type: docker -name: webUISecV-master-firefox-mariadb10.2-php7.2 +name: webUISecV-latest-chrome-mariadb10.2-php7.1 platform: os: linux @@ -1483,11 +1377,11 @@ steps: db_type: mysql db_username: owncloud exclude: apps/richdocuments - version: daily-master-qa + version: latest - name: install-testrunner pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.1 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1498,7 +1392,7 @@ steps: - name: setup-server-richdocuments pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.1 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1517,20 +1411,20 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.1 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.1 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh - make test-acceptance-webui environment: BEHAT_SUITE: webUISecureView - BROWSER: firefox + BROWSER: chrome PLATFORM: Linux SELENIUM_HOST: selenium SELENIUM_PORT: 4444 @@ -1548,14 +1442,13 @@ services: - name: selenium pull: always - image: selenium/standalone-firefox-debug:3.8.1 + image: selenium/standalone-chrome-debug:3.141.59-oxygen environment: JAVA_OPTS: -Dselenium.LOGGER.level=WARNING - SE_OPTS: -enablePassThrough false - name: server pull: always - image: owncloudci/php:7.2 + image: owncloudci/php:7.1 command: - /usr/local/bin/apachectl - -e @@ -1572,7 +1465,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1580,7 +1472,7 @@ depends_on: --- kind: pipeline type: docker -name: webUISecV-master-firefox-mariadb10.2-php7.3 +name: webUISecV-latest-chrome-mariadb10.2-php7.2 platform: os: linux @@ -1602,11 +1494,11 @@ steps: db_type: mysql db_username: owncloud exclude: apps/richdocuments - version: daily-master-qa + version: latest - name: install-testrunner pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.2 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1617,7 +1509,7 @@ steps: - name: setup-server-richdocuments pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.2 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1636,20 +1528,20 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.2 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.2 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh - make test-acceptance-webui environment: BEHAT_SUITE: webUISecureView - BROWSER: firefox + BROWSER: chrome PLATFORM: Linux SELENIUM_HOST: selenium SELENIUM_PORT: 4444 @@ -1667,14 +1559,13 @@ services: - name: selenium pull: always - image: selenium/standalone-firefox-debug:3.8.1 + image: selenium/standalone-chrome-debug:3.141.59-oxygen environment: JAVA_OPTS: -Dselenium.LOGGER.level=WARNING - SE_OPTS: -enablePassThrough false - name: server pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.2 command: - /usr/local/bin/apachectl - -e @@ -1691,7 +1582,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -1699,7 +1589,7 @@ depends_on: --- kind: pipeline type: docker -name: webUISecV-latest-chrome-mariadb10.2-php7.0 +name: webUISecV-latest-chrome-mariadb10.2-php7.3 platform: os: linux @@ -1725,7 +1615,7 @@ steps: - name: install-testrunner pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.3 commands: - mkdir /tmp/testrunner - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner @@ -1736,7 +1626,7 @@ steps: - name: setup-server-richdocuments pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.3 commands: - cd /var/www/owncloud/server - php occ a:l @@ -1755,367 +1645,13 @@ steps: - name: fix-permissions pull: always - image: owncloudci/php:7.0 + image: owncloudci/php:7.3 commands: - chown -R www-data /var/www/owncloud/server - name: acceptance-tests pull: always - image: owncloudci/php:7.0 - commands: - - touch /var/www/owncloud/saved-settings.sh - - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-webui - environment: - BEHAT_SUITE: webUISecureView - BROWSER: chrome - PLATFORM: Linux - SELENIUM_HOST: selenium - SELENIUM_PORT: 4444 - TEST_SERVER_URL: http://server - -services: -- name: mariadb - pull: always - image: mariadb:10.2 - environment: - MYSQL_DATABASE: owncloud - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - -- name: selenium - pull: always - image: selenium/standalone-chrome-debug:3.141.59-oxygen - environment: - JAVA_OPTS: -Dselenium.LOGGER.level=WARNING - -- name: server - pull: always - image: owncloudci/php:7.0 - command: - - /usr/local/bin/apachectl - - -e - - debug - - -D - - FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/server - -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 - ---- -kind: pipeline -type: docker -name: webUISecV-latest-chrome-mariadb10.2-php7.1 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: testrunner/apps/richdocuments - -steps: -- name: install-core - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/server - db_host: mariadb - db_name: owncloud - db_password: owncloud - db_type: mysql - db_username: owncloud - exclude: apps/richdocuments - version: latest - -- name: install-testrunner - pull: always - image: owncloudci/php:7.1 - commands: - - mkdir /tmp/testrunner - - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner - - rsync -aIX /tmp/testrunner /var/www/owncloud - - cp -r /var/www/owncloud/testrunner/apps/richdocuments /var/www/owncloud/server/apps/ - - cd /var/www/owncloud/testrunner - - make install-composer-deps vendor-bin-deps - -- name: setup-server-richdocuments - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e richdocuments - - 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: owncloud-log-server - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/server/data/owncloud.log - -- name: fix-permissions - pull: always - image: owncloudci/php:7.1 - commands: - - chown -R www-data /var/www/owncloud/server - -- name: acceptance-tests - pull: always - image: owncloudci/php:7.1 - commands: - - touch /var/www/owncloud/saved-settings.sh - - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-webui - environment: - BEHAT_SUITE: webUISecureView - BROWSER: chrome - PLATFORM: Linux - SELENIUM_HOST: selenium - SELENIUM_PORT: 4444 - TEST_SERVER_URL: http://server - -services: -- name: mariadb - pull: always - image: mariadb:10.2 - environment: - MYSQL_DATABASE: owncloud - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - -- name: selenium - pull: always - image: selenium/standalone-chrome-debug:3.141.59-oxygen - environment: - JAVA_OPTS: -Dselenium.LOGGER.level=WARNING - -- name: server - pull: always - image: owncloudci/php:7.1 - command: - - /usr/local/bin/apachectl - - -e - - debug - - -D - - FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/server - -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 - ---- -kind: pipeline -type: docker -name: webUISecV-latest-chrome-mariadb10.2-php7.2 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: testrunner/apps/richdocuments - -steps: -- name: install-core - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/server - db_host: mariadb - db_name: owncloud - db_password: owncloud - db_type: mysql - db_username: owncloud - exclude: apps/richdocuments - version: latest - -- name: install-testrunner - pull: always - image: owncloudci/php:7.2 - commands: - - mkdir /tmp/testrunner - - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner - - rsync -aIX /tmp/testrunner /var/www/owncloud - - cp -r /var/www/owncloud/testrunner/apps/richdocuments /var/www/owncloud/server/apps/ - - cd /var/www/owncloud/testrunner - - make install-composer-deps vendor-bin-deps - -- name: setup-server-richdocuments - pull: always - image: owncloudci/php:7.2 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e richdocuments - - 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: owncloud-log-server - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/server/data/owncloud.log - -- name: fix-permissions - pull: always - image: owncloudci/php:7.2 - commands: - - chown -R www-data /var/www/owncloud/server - -- name: acceptance-tests - pull: always - image: owncloudci/php:7.2 - commands: - - touch /var/www/owncloud/saved-settings.sh - - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-webui - environment: - BEHAT_SUITE: webUISecureView - BROWSER: chrome - PLATFORM: Linux - SELENIUM_HOST: selenium - SELENIUM_PORT: 4444 - TEST_SERVER_URL: http://server - -services: -- name: mariadb - pull: always - image: mariadb:10.2 - environment: - MYSQL_DATABASE: owncloud - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - -- name: selenium - pull: always - image: selenium/standalone-chrome-debug:3.141.59-oxygen - environment: - JAVA_OPTS: -Dselenium.LOGGER.level=WARNING - -- name: server - pull: always - image: owncloudci/php:7.2 - command: - - /usr/local/bin/apachectl - - -e - - debug - - -D - - FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/server - -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 - ---- -kind: pipeline -type: docker -name: webUISecV-latest-chrome-mariadb10.2-php7.3 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: testrunner/apps/richdocuments - -steps: -- name: install-core - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/server - db_host: mariadb - db_name: owncloud - db_password: owncloud - db_type: mysql - db_username: owncloud - exclude: apps/richdocuments - version: latest - -- name: install-testrunner - pull: always - image: owncloudci/php:7.3 - commands: - - mkdir /tmp/testrunner - - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner - - rsync -aIX /tmp/testrunner /var/www/owncloud - - cp -r /var/www/owncloud/testrunner/apps/richdocuments /var/www/owncloud/server/apps/ - - cd /var/www/owncloud/testrunner - - make install-composer-deps vendor-bin-deps - -- name: setup-server-richdocuments - pull: always - image: owncloudci/php:7.3 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e richdocuments - - 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: owncloud-log-server - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/server/data/owncloud.log - -- name: fix-permissions - pull: always - image: owncloudci/php:7.3 - commands: - - chown -R www-data /var/www/owncloud/server - -- name: acceptance-tests - pull: always - image: owncloudci/php:7.3 + image: owncloudci/php:7.3 commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh @@ -2163,126 +1699,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: webUISecV-latest-firefox-mariadb10.2-php7.0 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: testrunner/apps/richdocuments - -steps: -- name: install-core - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/server - db_host: mariadb - db_name: owncloud - db_password: owncloud - db_type: mysql - db_username: owncloud - exclude: apps/richdocuments - version: latest - -- name: install-testrunner - pull: always - image: owncloudci/php:7.0 - commands: - - mkdir /tmp/testrunner - - git clone -b master --depth=1 https://github.com/owncloud/core.git /tmp/testrunner - - rsync -aIX /tmp/testrunner /var/www/owncloud - - cp -r /var/www/owncloud/testrunner/apps/richdocuments /var/www/owncloud/server/apps/ - - cd /var/www/owncloud/testrunner - - make install-composer-deps vendor-bin-deps - -- name: setup-server-richdocuments - pull: always - image: owncloudci/php:7.0 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e richdocuments - - 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: owncloud-log-server - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/server/data/owncloud.log - -- name: fix-permissions - pull: always - image: owncloudci/php:7.0 - commands: - - chown -R www-data /var/www/owncloud/server - -- name: acceptance-tests - pull: always - image: owncloudci/php:7.0 - commands: - - touch /var/www/owncloud/saved-settings.sh - - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-webui - environment: - BEHAT_SUITE: webUISecureView - BROWSER: firefox - PLATFORM: Linux - SELENIUM_HOST: selenium - SELENIUM_PORT: 4444 - TEST_SERVER_URL: http://server - -services: -- name: mariadb - pull: always - image: mariadb:10.2 - environment: - MYSQL_DATABASE: owncloud - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - -- name: selenium - pull: always - image: selenium/standalone-firefox-debug:3.8.1 - environment: - JAVA_OPTS: -Dselenium.LOGGER.level=WARNING - SE_OPTS: -enablePassThrough false - -- name: server - pull: always - image: owncloudci/php:7.0 - command: - - /usr/local/bin/apachectl - - -e - - debug - - -D - - FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/server - -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 @@ -2401,7 +1817,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -2520,7 +1935,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -2639,7 +2053,6 @@ trigger: - refs/heads/master depends_on: -- coding-standard-php7.0 - coding-standard-php7.1 - coding-standard-php7.2 - coding-standard-php7.3 @@ -2674,28 +2087,23 @@ 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 -- webUISecV-master-chrome-mariadb10.2-php7.0 - webUISecV-master-chrome-mariadb10.2-php7.1 - webUISecV-master-chrome-mariadb10.2-php7.2 - webUISecV-master-chrome-mariadb10.2-php7.3 -- webUISecV-master-firefox-mariadb10.2-php7.0 - webUISecV-master-firefox-mariadb10.2-php7.1 - webUISecV-master-firefox-mariadb10.2-php7.2 - webUISecV-master-firefox-mariadb10.2-php7.3 -- webUISecV-latest-chrome-mariadb10.2-php7.0 - webUISecV-latest-chrome-mariadb10.2-php7.1 - webUISecV-latest-chrome-mariadb10.2-php7.2 - webUISecV-latest-chrome-mariadb10.2-php7.3 -- webUISecV-latest-firefox-mariadb10.2-php7.0 - webUISecV-latest-firefox-mariadb10.2-php7.1 - webUISecV-latest-firefox-mariadb10.2-php7.2 - webUISecV-latest-firefox-mariadb10.2-php7.3