diff --git a/.drone.starlark b/.drone.starlark index 4c0f4a38..99b77fd8 100644 --- a/.drone.starlark +++ b/.drone.starlark @@ -137,7 +137,7 @@ config = { ], 'runCoreTests': True, 'runAllSuites': True, - 'numberOfParts': 32, + 'numberOfParts': 30, 'emailNeeded': True, 'federatedServerNeeded': True, 'extraEnvironment': { @@ -169,7 +169,7 @@ config = { ], 'runCoreTests': True, 'runAllSuites': True, - 'numberOfParts': 32, + 'numberOfParts': 30, 'emailNeeded': True, 'federatedServerNeeded': True, 'cron': 'nightly', @@ -202,7 +202,7 @@ config = { ], 'runCoreTests': True, 'runAllSuites': True, - 'numberOfParts': 32, + 'numberOfParts': 30, 'emailNeeded': True, 'federatedServerNeeded': True, 'extraEnvironment': { @@ -234,7 +234,7 @@ config = { ], 'runCoreTests': True, 'runAllSuites': True, - 'numberOfParts': 32, + 'numberOfParts': 30, 'emailNeeded': True, 'federatedServerNeeded': True, 'cron': 'nightly', @@ -255,6 +255,68 @@ config = { } ], }, + 'cli-core-masterkey': { + 'suites': [ + 'cliCoreMKey', + ], + 'databases': [ + 'mysql:5.7', + ], + 'servers': [ + 'daily-master-qa', + ], + 'runCoreTests': True, + 'runAllSuites': True, + 'numberOfParts': 3, + 'emailNeeded': True, + 'extraEnvironment': { + 'ENCRYPTION_TYPE': 'masterkey', + }, + 'extraSetup': [ + { + 'name': 'configure-app', + 'image': 'owncloudci/php:7.1', + 'pull': 'always', + 'commands': [ + 'cd /var/www/owncloud/server', + 'php occ encryption:enable', + 'php occ encryption:select-encryption-type masterkey --yes', + 'php occ config:list', + ] + } + ], + }, + 'cli-core-userkeys': { + 'suites': [ + 'cliCoreUKey', + ], + 'databases': [ + 'mysql:5.7', + ], + 'servers': [ + 'daily-master-qa', + ], + 'runCoreTests': True, + 'runAllSuites': True, + 'numberOfParts': 3, + 'emailNeeded': True, + 'extraEnvironment': { + 'ENCRYPTION_TYPE': 'user-keys', + }, + 'extraSetup': [ + { + 'name': 'configure-app', + 'image': 'owncloudci/php:7.1', + 'pull': 'always', + 'commands': [ + 'cd /var/www/owncloud/server', + 'php occ encryption:enable', + 'php occ encryption:select-encryption-type user-keys --yes', + 'php occ config:list', + ] + } + ], + }, 'webUI-core-masterkey': { 'suites': [ 'webUIcoreMKey', diff --git a/.drone.yml b/.drone.yml index bfcbea69..4af0b883 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1613,7 +1613,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-1-master-mysql5.7-php7.1 +name: apiCoreMKey-30-1-master-mysql5.7-php7.1 platform: os: linux @@ -1723,7 +1723,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 1 @@ -1782,7 +1782,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-2-master-mysql5.7-php7.1 +name: apiCoreMKey-30-2-master-mysql5.7-php7.1 platform: os: linux @@ -1892,7 +1892,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 2 @@ -1951,7 +1951,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-3-master-mysql5.7-php7.1 +name: apiCoreMKey-30-3-master-mysql5.7-php7.1 platform: os: linux @@ -2061,7 +2061,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 3 @@ -2120,7 +2120,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-4-master-mysql5.7-php7.1 +name: apiCoreMKey-30-4-master-mysql5.7-php7.1 platform: os: linux @@ -2230,7 +2230,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 4 @@ -2289,7 +2289,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-5-master-mysql5.7-php7.1 +name: apiCoreMKey-30-5-master-mysql5.7-php7.1 platform: os: linux @@ -2399,7 +2399,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 5 @@ -2458,7 +2458,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-6-master-mysql5.7-php7.1 +name: apiCoreMKey-30-6-master-mysql5.7-php7.1 platform: os: linux @@ -2568,7 +2568,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 6 @@ -2627,7 +2627,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-7-master-mysql5.7-php7.1 +name: apiCoreMKey-30-7-master-mysql5.7-php7.1 platform: os: linux @@ -2737,7 +2737,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 7 @@ -2796,7 +2796,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-8-master-mysql5.7-php7.1 +name: apiCoreMKey-30-8-master-mysql5.7-php7.1 platform: os: linux @@ -2906,7 +2906,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 8 @@ -2965,7 +2965,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-9-master-mysql5.7-php7.1 +name: apiCoreMKey-30-9-master-mysql5.7-php7.1 platform: os: linux @@ -3075,7 +3075,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 9 @@ -3134,7 +3134,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-10-master-mysql5.7-php7.1 +name: apiCoreMKey-30-10-master-mysql5.7-php7.1 platform: os: linux @@ -3244,7 +3244,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 10 @@ -3303,7 +3303,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-11-master-mysql5.7-php7.1 +name: apiCoreMKey-30-11-master-mysql5.7-php7.1 platform: os: linux @@ -3413,7 +3413,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 11 @@ -3472,7 +3472,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-12-master-mysql5.7-php7.1 +name: apiCoreMKey-30-12-master-mysql5.7-php7.1 platform: os: linux @@ -3582,7 +3582,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 12 @@ -3641,7 +3641,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-13-master-mysql5.7-php7.1 +name: apiCoreMKey-30-13-master-mysql5.7-php7.1 platform: os: linux @@ -3751,7 +3751,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 13 @@ -3810,7 +3810,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-14-master-mysql5.7-php7.1 +name: apiCoreMKey-30-14-master-mysql5.7-php7.1 platform: os: linux @@ -3920,7 +3920,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 14 @@ -3979,7 +3979,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-15-master-mysql5.7-php7.1 +name: apiCoreMKey-30-15-master-mysql5.7-php7.1 platform: os: linux @@ -4089,7 +4089,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 15 @@ -4148,7 +4148,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-16-master-mysql5.7-php7.1 +name: apiCoreMKey-30-16-master-mysql5.7-php7.1 platform: os: linux @@ -4258,7 +4258,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 16 @@ -4317,7 +4317,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-17-master-mysql5.7-php7.1 +name: apiCoreMKey-30-17-master-mysql5.7-php7.1 platform: os: linux @@ -4427,7 +4427,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 17 @@ -4486,7 +4486,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-18-master-mysql5.7-php7.1 +name: apiCoreMKey-30-18-master-mysql5.7-php7.1 platform: os: linux @@ -4596,7 +4596,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 18 @@ -4655,7 +4655,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-19-master-mysql5.7-php7.1 +name: apiCoreMKey-30-19-master-mysql5.7-php7.1 platform: os: linux @@ -4765,7 +4765,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 19 @@ -4824,7 +4824,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-20-master-mysql5.7-php7.1 +name: apiCoreMKey-30-20-master-mysql5.7-php7.1 platform: os: linux @@ -4934,7 +4934,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 20 @@ -4993,7 +4993,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-21-master-mysql5.7-php7.1 +name: apiCoreMKey-30-21-master-mysql5.7-php7.1 platform: os: linux @@ -5103,7 +5103,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 21 @@ -5162,7 +5162,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-22-master-mysql5.7-php7.1 +name: apiCoreMKey-30-22-master-mysql5.7-php7.1 platform: os: linux @@ -5272,7 +5272,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 22 @@ -5331,7 +5331,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-23-master-mysql5.7-php7.1 +name: apiCoreMKey-30-23-master-mysql5.7-php7.1 platform: os: linux @@ -5441,7 +5441,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 23 @@ -5500,7 +5500,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-24-master-mysql5.7-php7.1 +name: apiCoreMKey-30-24-master-mysql5.7-php7.1 platform: os: linux @@ -5610,7 +5610,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 24 @@ -5669,7 +5669,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-25-master-mysql5.7-php7.1 +name: apiCoreMKey-30-25-master-mysql5.7-php7.1 platform: os: linux @@ -5779,7 +5779,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 25 @@ -5838,7 +5838,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-26-master-mysql5.7-php7.1 +name: apiCoreMKey-30-26-master-mysql5.7-php7.1 platform: os: linux @@ -5948,7 +5948,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 26 @@ -6007,7 +6007,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-27-master-mysql5.7-php7.1 +name: apiCoreMKey-30-27-master-mysql5.7-php7.1 platform: os: linux @@ -6117,7 +6117,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 27 @@ -6176,7 +6176,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-28-master-mysql5.7-php7.1 +name: apiCoreMKey-30-28-master-mysql5.7-php7.1 platform: os: linux @@ -6286,7 +6286,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 28 @@ -6345,7 +6345,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-29-master-mysql5.7-php7.1 +name: apiCoreMKey-30-29-master-mysql5.7-php7.1 platform: os: linux @@ -6455,7 +6455,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 29 @@ -6514,7 +6514,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-30-master-mysql5.7-php7.1 +name: apiCoreMKey-30-30-master-mysql5.7-php7.1 platform: os: linux @@ -6624,7 +6624,7 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email RUN_PART: 30 @@ -6683,7 +6683,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-31-master-mysql5.7-php7.1 +name: apiCoreMKey-30-1-latest-mysql5.7-php7.1 platform: os: linux @@ -6705,176 +6705,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: daily-master-qa - -- 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/encryption /var/www/owncloud/server/apps/ - -- name: install-federated - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/federated - db_host: mysql-federated - db_name: owncloud-federated - db_password: owncloud - db_type: mysql - db_username: owncloud - version: daily-master-qa - -- name: configure-federation - pull: always - image: owncloudci/php:7.1 - commands: - - echo "export TEST_SERVER_FED_URL=http://federated" > /var/www/owncloud/saved-settings.sh - - cd /var/www/owncloud/federated - - php occ a:l - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=federated - - php occ log:manage --level 2 - - php occ config:list - -- name: owncloud-log-federated - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/federated/data/owncloud.log - -- name: setup-server-encryption - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e encryption - - 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: configure-app - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ encryption:enable - - php occ encryption:select-encryption-type masterkey --yes - - php occ config:list - -- name: fix-permissions - pull: always - image: owncloudci/php:7.1 - commands: - - chown -R www-data /var/www/owncloud/server - - wait-for-it -t 600 server:80 - - chown -R www-data /var/www/owncloud/federated - - wait-for-it -t 600 federated:80 - -- 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-core-api - environment: - DIVIDE_INTO_NUM_PARTS: 32 - ENCRYPTION_TYPE: masterkey - MAILHOG_HOST: email - RUN_PART: 31 - TEST_SERVER_URL: http://server - -services: -- name: mysql - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - -- name: email - pull: always - image: mailhog/mailhog - -- name: server - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/server - -- name: federated - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/federated - -- name: mysql-federated - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud-federated - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - -trigger: - ref: - - refs/pull/** - - refs/tags/** - - refs/heads/master - -depends_on: -- coding-standard-php7.1 -- coding-standard-php7.2 -- coding-standard-php7.3 - ---- -kind: pipeline -type: docker -name: apiCoreMKey-32-32-master-mysql5.7-php7.1 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: testrunner/apps/encryption - -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/encryption - version: daily-master-qa + version: latest - name: install-testrunner pull: always @@ -6895,7 +6726,7 @@ steps: db_password: owncloud db_type: mysql db_username: owncloud - version: daily-master-qa + version: latest - name: configure-federation pull: always @@ -6962,10 +6793,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 32 + RUN_PART: 1 TEST_SERVER_URL: http://server services: @@ -7008,10 +6839,8 @@ services: MYSQL_USER: owncloud trigger: - ref: - - refs/pull/** - - refs/tags/** - - refs/heads/master + cron: + - nightly depends_on: - coding-standard-php7.1 @@ -7021,7 +6850,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-1-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-2-latest-mysql5.7-php7.1 platform: os: linux @@ -7131,10 +6960,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 1 + RUN_PART: 2 TEST_SERVER_URL: http://server services: @@ -7188,7 +7017,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-2-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-3-latest-mysql5.7-php7.1 platform: os: linux @@ -7298,10 +7127,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 2 + RUN_PART: 3 TEST_SERVER_URL: http://server services: @@ -7355,7 +7184,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-3-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-4-latest-mysql5.7-php7.1 platform: os: linux @@ -7465,10 +7294,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 3 + RUN_PART: 4 TEST_SERVER_URL: http://server services: @@ -7522,7 +7351,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-4-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-5-latest-mysql5.7-php7.1 platform: os: linux @@ -7632,10 +7461,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 4 + RUN_PART: 5 TEST_SERVER_URL: http://server services: @@ -7689,7 +7518,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-5-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-6-latest-mysql5.7-php7.1 platform: os: linux @@ -7799,10 +7628,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 5 + RUN_PART: 6 TEST_SERVER_URL: http://server services: @@ -7856,7 +7685,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-6-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-7-latest-mysql5.7-php7.1 platform: os: linux @@ -7966,10 +7795,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 6 + RUN_PART: 7 TEST_SERVER_URL: http://server services: @@ -8023,7 +7852,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-7-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-8-latest-mysql5.7-php7.1 platform: os: linux @@ -8133,10 +7962,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 7 + RUN_PART: 8 TEST_SERVER_URL: http://server services: @@ -8190,7 +8019,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-8-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-9-latest-mysql5.7-php7.1 platform: os: linux @@ -8300,10 +8129,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 8 + RUN_PART: 9 TEST_SERVER_URL: http://server services: @@ -8357,7 +8186,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-9-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-10-latest-mysql5.7-php7.1 platform: os: linux @@ -8467,10 +8296,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 9 + RUN_PART: 10 TEST_SERVER_URL: http://server services: @@ -8524,7 +8353,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-10-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-11-latest-mysql5.7-php7.1 platform: os: linux @@ -8634,10 +8463,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 10 + RUN_PART: 11 TEST_SERVER_URL: http://server services: @@ -8691,7 +8520,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-11-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-12-latest-mysql5.7-php7.1 platform: os: linux @@ -8801,10 +8630,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 11 + RUN_PART: 12 TEST_SERVER_URL: http://server services: @@ -8858,7 +8687,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-12-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-13-latest-mysql5.7-php7.1 platform: os: linux @@ -8968,10 +8797,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 12 + RUN_PART: 13 TEST_SERVER_URL: http://server services: @@ -9025,7 +8854,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-13-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-14-latest-mysql5.7-php7.1 platform: os: linux @@ -9135,10 +8964,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 13 + RUN_PART: 14 TEST_SERVER_URL: http://server services: @@ -9192,7 +9021,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-14-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-15-latest-mysql5.7-php7.1 platform: os: linux @@ -9302,10 +9131,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 14 + RUN_PART: 15 TEST_SERVER_URL: http://server services: @@ -9359,7 +9188,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-15-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-16-latest-mysql5.7-php7.1 platform: os: linux @@ -9469,10 +9298,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 15 + RUN_PART: 16 TEST_SERVER_URL: http://server services: @@ -9526,7 +9355,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-16-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-17-latest-mysql5.7-php7.1 platform: os: linux @@ -9636,10 +9465,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 16 + RUN_PART: 17 TEST_SERVER_URL: http://server services: @@ -9693,7 +9522,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-17-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-18-latest-mysql5.7-php7.1 platform: os: linux @@ -9803,10 +9632,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 17 + RUN_PART: 18 TEST_SERVER_URL: http://server services: @@ -9860,7 +9689,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-18-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-19-latest-mysql5.7-php7.1 platform: os: linux @@ -9970,10 +9799,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 18 + RUN_PART: 19 TEST_SERVER_URL: http://server services: @@ -10027,7 +9856,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-19-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-20-latest-mysql5.7-php7.1 platform: os: linux @@ -10137,10 +9966,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 19 + RUN_PART: 20 TEST_SERVER_URL: http://server services: @@ -10194,7 +10023,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-20-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-21-latest-mysql5.7-php7.1 platform: os: linux @@ -10304,10 +10133,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 20 + RUN_PART: 21 TEST_SERVER_URL: http://server services: @@ -10361,7 +10190,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-21-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-22-latest-mysql5.7-php7.1 platform: os: linux @@ -10471,10 +10300,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 21 + RUN_PART: 22 TEST_SERVER_URL: http://server services: @@ -10528,7 +10357,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-22-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-23-latest-mysql5.7-php7.1 platform: os: linux @@ -10638,10 +10467,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 22 + RUN_PART: 23 TEST_SERVER_URL: http://server services: @@ -10695,7 +10524,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-23-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-24-latest-mysql5.7-php7.1 platform: os: linux @@ -10805,10 +10634,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 23 + RUN_PART: 24 TEST_SERVER_URL: http://server services: @@ -10862,7 +10691,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-24-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-25-latest-mysql5.7-php7.1 platform: os: linux @@ -10972,10 +10801,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 24 + RUN_PART: 25 TEST_SERVER_URL: http://server services: @@ -11029,7 +10858,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-25-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-26-latest-mysql5.7-php7.1 platform: os: linux @@ -11139,10 +10968,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 25 + RUN_PART: 26 TEST_SERVER_URL: http://server services: @@ -11196,7 +11025,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-26-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-27-latest-mysql5.7-php7.1 platform: os: linux @@ -11306,10 +11135,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 26 + RUN_PART: 27 TEST_SERVER_URL: http://server services: @@ -11363,7 +11192,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-27-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-28-latest-mysql5.7-php7.1 platform: os: linux @@ -11473,10 +11302,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 27 + RUN_PART: 28 TEST_SERVER_URL: http://server services: @@ -11530,7 +11359,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-28-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-29-latest-mysql5.7-php7.1 platform: os: linux @@ -11640,10 +11469,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 28 + RUN_PART: 29 TEST_SERVER_URL: http://server services: @@ -11697,7 +11526,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-29-latest-mysql5.7-php7.1 +name: apiCoreMKey-30-30-latest-mysql5.7-php7.1 platform: os: linux @@ -11807,10 +11636,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 29 + RUN_PART: 30 TEST_SERVER_URL: http://server services: @@ -11864,7 +11693,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-30-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-1-master-mysql5.7-php7.1 platform: os: linux @@ -11886,7 +11715,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: latest + version: daily-master-qa - name: install-testrunner pull: always @@ -11907,7 +11736,7 @@ steps: db_password: owncloud db_type: mysql db_username: owncloud - version: latest + version: daily-master-qa - name: configure-federation pull: always @@ -11954,7 +11783,7 @@ steps: commands: - cd /var/www/owncloud/server - php occ encryption:enable - - php occ encryption:select-encryption-type masterkey --yes + - php occ encryption:select-encryption-type user-keys --yes - php occ config:list - name: fix-permissions @@ -11974,10 +11803,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 - ENCRYPTION_TYPE: masterkey + DIVIDE_INTO_NUM_PARTS: 30 + ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 30 + RUN_PART: 1 TEST_SERVER_URL: http://server services: @@ -12020,8 +11849,10 @@ services: MYSQL_USER: owncloud trigger: - cron: - - nightly + ref: + - refs/pull/** + - refs/tags/** + - refs/heads/master depends_on: - coding-standard-php7.1 @@ -12031,7 +11862,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreMKey-32-31-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-2-master-mysql5.7-php7.1 platform: os: linux @@ -12053,7 +11884,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: latest + version: daily-master-qa - name: install-testrunner pull: always @@ -12074,7 +11905,7 @@ steps: db_password: owncloud db_type: mysql db_username: owncloud - version: latest + version: daily-master-qa - name: configure-federation pull: always @@ -12121,7 +11952,7 @@ steps: commands: - cd /var/www/owncloud/server - php occ encryption:enable - - php occ encryption:select-encryption-type masterkey --yes + - php occ encryption:select-encryption-type user-keys --yes - php occ config:list - name: fix-permissions @@ -12141,10 +11972,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 - ENCRYPTION_TYPE: masterkey + DIVIDE_INTO_NUM_PARTS: 30 + ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 31 + RUN_PART: 2 TEST_SERVER_URL: http://server services: @@ -12187,175 +12018,10 @@ services: MYSQL_USER: owncloud trigger: - cron: - - nightly - -depends_on: -- coding-standard-php7.1 -- coding-standard-php7.2 -- coding-standard-php7.3 - ---- -kind: pipeline -type: docker -name: apiCoreMKey-32-32-latest-mysql5.7-php7.1 - -platform: - os: linux - arch: amd64 - -workspace: - base: /var/www/owncloud - path: testrunner/apps/encryption - -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/encryption - 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/encryption /var/www/owncloud/server/apps/ - -- name: install-federated - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/federated - db_host: mysql-federated - db_name: owncloud-federated - db_password: owncloud - db_type: mysql - db_username: owncloud - version: latest - -- name: configure-federation - pull: always - image: owncloudci/php:7.1 - commands: - - echo "export TEST_SERVER_FED_URL=http://federated" > /var/www/owncloud/saved-settings.sh - - cd /var/www/owncloud/federated - - php occ a:l - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=federated - - php occ log:manage --level 2 - - php occ config:list - -- name: owncloud-log-federated - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/federated/data/owncloud.log - -- name: setup-server-encryption - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ a:l - - php occ a:e encryption - - 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: configure-app - pull: always - image: owncloudci/php:7.1 - commands: - - cd /var/www/owncloud/server - - php occ encryption:enable - - php occ encryption:select-encryption-type masterkey --yes - - php occ config:list - -- name: fix-permissions - pull: always - image: owncloudci/php:7.1 - commands: - - chown -R www-data /var/www/owncloud/server - - wait-for-it -t 600 server:80 - - chown -R www-data /var/www/owncloud/federated - - wait-for-it -t 600 federated:80 - -- 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-core-api - environment: - DIVIDE_INTO_NUM_PARTS: 32 - ENCRYPTION_TYPE: masterkey - MAILHOG_HOST: email - RUN_PART: 32 - TEST_SERVER_URL: http://server - -services: -- name: mysql - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - -- name: email - pull: always - image: mailhog/mailhog - -- name: server - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/server - -- name: federated - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/federated - -- name: mysql-federated - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud-federated - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - -trigger: - cron: - - nightly + ref: + - refs/pull/** + - refs/tags/** + - refs/heads/master depends_on: - coding-standard-php7.1 @@ -12365,7 +12031,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-1-master-mysql5.7-php7.1 +name: apiCoreUKey-30-3-master-mysql5.7-php7.1 platform: os: linux @@ -12475,10 +12141,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 1 + RUN_PART: 3 TEST_SERVER_URL: http://server services: @@ -12534,7 +12200,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-2-master-mysql5.7-php7.1 +name: apiCoreUKey-30-4-master-mysql5.7-php7.1 platform: os: linux @@ -12644,10 +12310,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 2 + RUN_PART: 4 TEST_SERVER_URL: http://server services: @@ -12703,7 +12369,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-3-master-mysql5.7-php7.1 +name: apiCoreUKey-30-5-master-mysql5.7-php7.1 platform: os: linux @@ -12813,10 +12479,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 3 + RUN_PART: 5 TEST_SERVER_URL: http://server services: @@ -12872,7 +12538,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-4-master-mysql5.7-php7.1 +name: apiCoreUKey-30-6-master-mysql5.7-php7.1 platform: os: linux @@ -12982,10 +12648,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 4 + RUN_PART: 6 TEST_SERVER_URL: http://server services: @@ -13041,7 +12707,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-5-master-mysql5.7-php7.1 +name: apiCoreUKey-30-7-master-mysql5.7-php7.1 platform: os: linux @@ -13151,10 +12817,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 5 + RUN_PART: 7 TEST_SERVER_URL: http://server services: @@ -13210,7 +12876,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-6-master-mysql5.7-php7.1 +name: apiCoreUKey-30-8-master-mysql5.7-php7.1 platform: os: linux @@ -13320,10 +12986,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 6 + RUN_PART: 8 TEST_SERVER_URL: http://server services: @@ -13379,7 +13045,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-7-master-mysql5.7-php7.1 +name: apiCoreUKey-30-9-master-mysql5.7-php7.1 platform: os: linux @@ -13489,10 +13155,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 7 + RUN_PART: 9 TEST_SERVER_URL: http://server services: @@ -13548,7 +13214,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-8-master-mysql5.7-php7.1 +name: apiCoreUKey-30-10-master-mysql5.7-php7.1 platform: os: linux @@ -13658,10 +13324,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 8 + RUN_PART: 10 TEST_SERVER_URL: http://server services: @@ -13717,7 +13383,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-9-master-mysql5.7-php7.1 +name: apiCoreUKey-30-11-master-mysql5.7-php7.1 platform: os: linux @@ -13827,10 +13493,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 9 + RUN_PART: 11 TEST_SERVER_URL: http://server services: @@ -13886,7 +13552,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-10-master-mysql5.7-php7.1 +name: apiCoreUKey-30-12-master-mysql5.7-php7.1 platform: os: linux @@ -13996,10 +13662,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 10 + RUN_PART: 12 TEST_SERVER_URL: http://server services: @@ -14055,7 +13721,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-11-master-mysql5.7-php7.1 +name: apiCoreUKey-30-13-master-mysql5.7-php7.1 platform: os: linux @@ -14165,10 +13831,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 11 + RUN_PART: 13 TEST_SERVER_URL: http://server services: @@ -14224,7 +13890,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-12-master-mysql5.7-php7.1 +name: apiCoreUKey-30-14-master-mysql5.7-php7.1 platform: os: linux @@ -14334,10 +14000,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 12 + RUN_PART: 14 TEST_SERVER_URL: http://server services: @@ -14393,7 +14059,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-13-master-mysql5.7-php7.1 +name: apiCoreUKey-30-15-master-mysql5.7-php7.1 platform: os: linux @@ -14503,10 +14169,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 13 + RUN_PART: 15 TEST_SERVER_URL: http://server services: @@ -14562,7 +14228,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-14-master-mysql5.7-php7.1 +name: apiCoreUKey-30-16-master-mysql5.7-php7.1 platform: os: linux @@ -14672,10 +14338,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 14 + RUN_PART: 16 TEST_SERVER_URL: http://server services: @@ -14731,7 +14397,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-15-master-mysql5.7-php7.1 +name: apiCoreUKey-30-17-master-mysql5.7-php7.1 platform: os: linux @@ -14841,10 +14507,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 15 + RUN_PART: 17 TEST_SERVER_URL: http://server services: @@ -14900,7 +14566,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-16-master-mysql5.7-php7.1 +name: apiCoreUKey-30-18-master-mysql5.7-php7.1 platform: os: linux @@ -15010,10 +14676,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 16 + RUN_PART: 18 TEST_SERVER_URL: http://server services: @@ -15069,7 +14735,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-17-master-mysql5.7-php7.1 +name: apiCoreUKey-30-19-master-mysql5.7-php7.1 platform: os: linux @@ -15179,10 +14845,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 17 + RUN_PART: 19 TEST_SERVER_URL: http://server services: @@ -15238,7 +14904,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-18-master-mysql5.7-php7.1 +name: apiCoreUKey-30-20-master-mysql5.7-php7.1 platform: os: linux @@ -15348,10 +15014,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 18 + RUN_PART: 20 TEST_SERVER_URL: http://server services: @@ -15407,7 +15073,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-19-master-mysql5.7-php7.1 +name: apiCoreUKey-30-21-master-mysql5.7-php7.1 platform: os: linux @@ -15517,10 +15183,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 19 + RUN_PART: 21 TEST_SERVER_URL: http://server services: @@ -15576,7 +15242,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-20-master-mysql5.7-php7.1 +name: apiCoreUKey-30-22-master-mysql5.7-php7.1 platform: os: linux @@ -15686,10 +15352,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 20 + RUN_PART: 22 TEST_SERVER_URL: http://server services: @@ -15745,7 +15411,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-21-master-mysql5.7-php7.1 +name: apiCoreUKey-30-23-master-mysql5.7-php7.1 platform: os: linux @@ -15855,10 +15521,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 21 + RUN_PART: 23 TEST_SERVER_URL: http://server services: @@ -15914,7 +15580,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-22-master-mysql5.7-php7.1 +name: apiCoreUKey-30-24-master-mysql5.7-php7.1 platform: os: linux @@ -16024,10 +15690,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 22 + RUN_PART: 24 TEST_SERVER_URL: http://server services: @@ -16083,7 +15749,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-23-master-mysql5.7-php7.1 +name: apiCoreUKey-30-25-master-mysql5.7-php7.1 platform: os: linux @@ -16193,10 +15859,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 23 + RUN_PART: 25 TEST_SERVER_URL: http://server services: @@ -16252,7 +15918,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-24-master-mysql5.7-php7.1 +name: apiCoreUKey-30-26-master-mysql5.7-php7.1 platform: os: linux @@ -16362,10 +16028,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 24 + RUN_PART: 26 TEST_SERVER_URL: http://server services: @@ -16421,7 +16087,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-25-master-mysql5.7-php7.1 +name: apiCoreUKey-30-27-master-mysql5.7-php7.1 platform: os: linux @@ -16531,10 +16197,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 25 + RUN_PART: 27 TEST_SERVER_URL: http://server services: @@ -16590,7 +16256,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-26-master-mysql5.7-php7.1 +name: apiCoreUKey-30-28-master-mysql5.7-php7.1 platform: os: linux @@ -16700,10 +16366,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 26 + RUN_PART: 28 TEST_SERVER_URL: http://server services: @@ -16759,7 +16425,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-27-master-mysql5.7-php7.1 +name: apiCoreUKey-30-29-master-mysql5.7-php7.1 platform: os: linux @@ -16869,10 +16535,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 27 + RUN_PART: 29 TEST_SERVER_URL: http://server services: @@ -16928,7 +16594,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-28-master-mysql5.7-php7.1 +name: apiCoreUKey-30-30-master-mysql5.7-php7.1 platform: os: linux @@ -17038,10 +16704,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 28 + RUN_PART: 30 TEST_SERVER_URL: http://server services: @@ -17097,7 +16763,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-29-master-mysql5.7-php7.1 +name: apiCoreUKey-30-1-latest-mysql5.7-php7.1 platform: os: linux @@ -17119,7 +16785,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: daily-master-qa + version: latest - name: install-testrunner pull: always @@ -17140,7 +16806,7 @@ steps: db_password: owncloud db_type: mysql db_username: owncloud - version: daily-master-qa + version: latest - name: configure-federation pull: always @@ -17207,10 +16873,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 29 + RUN_PART: 1 TEST_SERVER_URL: http://server services: @@ -17253,10 +16919,8 @@ services: MYSQL_USER: owncloud trigger: - ref: - - refs/pull/** - - refs/tags/** - - refs/heads/master + cron: + - nightly depends_on: - coding-standard-php7.1 @@ -17266,7 +16930,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-30-master-mysql5.7-php7.1 +name: apiCoreUKey-30-2-latest-mysql5.7-php7.1 platform: os: linux @@ -17288,7 +16952,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: daily-master-qa + version: latest - name: install-testrunner pull: always @@ -17309,7 +16973,7 @@ steps: db_password: owncloud db_type: mysql db_username: owncloud - version: daily-master-qa + version: latest - name: configure-federation pull: always @@ -17376,10 +17040,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 30 + RUN_PART: 2 TEST_SERVER_URL: http://server services: @@ -17422,10 +17086,8 @@ services: MYSQL_USER: owncloud trigger: - ref: - - refs/pull/** - - refs/tags/** - - refs/heads/master + cron: + - nightly depends_on: - coding-standard-php7.1 @@ -17435,7 +17097,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-31-master-mysql5.7-php7.1 +name: apiCoreUKey-30-3-latest-mysql5.7-php7.1 platform: os: linux @@ -17457,7 +17119,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: daily-master-qa + version: latest - name: install-testrunner pull: always @@ -17478,7 +17140,7 @@ steps: db_password: owncloud db_type: mysql db_username: owncloud - version: daily-master-qa + version: latest - name: configure-federation pull: always @@ -17545,10 +17207,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 31 + RUN_PART: 3 TEST_SERVER_URL: http://server services: @@ -17591,10 +17253,8 @@ services: MYSQL_USER: owncloud trigger: - ref: - - refs/pull/** - - refs/tags/** - - refs/heads/master + cron: + - nightly depends_on: - coding-standard-php7.1 @@ -17604,7 +17264,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-32-master-mysql5.7-php7.1 +name: apiCoreUKey-30-4-latest-mysql5.7-php7.1 platform: os: linux @@ -17626,7 +17286,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: daily-master-qa + version: latest - name: install-testrunner pull: always @@ -17647,7 +17307,7 @@ steps: db_password: owncloud db_type: mysql db_username: owncloud - version: daily-master-qa + version: latest - name: configure-federation pull: always @@ -17714,10 +17374,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 32 + RUN_PART: 4 TEST_SERVER_URL: http://server services: @@ -17760,10 +17420,8 @@ services: MYSQL_USER: owncloud trigger: - ref: - - refs/pull/** - - refs/tags/** - - refs/heads/master + cron: + - nightly depends_on: - coding-standard-php7.1 @@ -17773,7 +17431,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-1-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-5-latest-mysql5.7-php7.1 platform: os: linux @@ -17883,10 +17541,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 1 + RUN_PART: 5 TEST_SERVER_URL: http://server services: @@ -17940,7 +17598,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-2-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-6-latest-mysql5.7-php7.1 platform: os: linux @@ -18050,10 +17708,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 2 + RUN_PART: 6 TEST_SERVER_URL: http://server services: @@ -18107,7 +17765,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-3-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-7-latest-mysql5.7-php7.1 platform: os: linux @@ -18217,10 +17875,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 3 + RUN_PART: 7 TEST_SERVER_URL: http://server services: @@ -18274,7 +17932,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-4-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-8-latest-mysql5.7-php7.1 platform: os: linux @@ -18384,10 +18042,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 4 + RUN_PART: 8 TEST_SERVER_URL: http://server services: @@ -18441,7 +18099,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-5-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-9-latest-mysql5.7-php7.1 platform: os: linux @@ -18551,10 +18209,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 5 + RUN_PART: 9 TEST_SERVER_URL: http://server services: @@ -18608,7 +18266,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-6-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-10-latest-mysql5.7-php7.1 platform: os: linux @@ -18718,10 +18376,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 6 + RUN_PART: 10 TEST_SERVER_URL: http://server services: @@ -18775,7 +18433,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-7-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-11-latest-mysql5.7-php7.1 platform: os: linux @@ -18885,10 +18543,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 7 + RUN_PART: 11 TEST_SERVER_URL: http://server services: @@ -18942,7 +18600,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-8-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-12-latest-mysql5.7-php7.1 platform: os: linux @@ -19052,10 +18710,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 8 + RUN_PART: 12 TEST_SERVER_URL: http://server services: @@ -19109,7 +18767,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-9-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-13-latest-mysql5.7-php7.1 platform: os: linux @@ -19219,10 +18877,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 9 + RUN_PART: 13 TEST_SERVER_URL: http://server services: @@ -19276,7 +18934,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-10-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-14-latest-mysql5.7-php7.1 platform: os: linux @@ -19386,10 +19044,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 10 + RUN_PART: 14 TEST_SERVER_URL: http://server services: @@ -19443,7 +19101,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-11-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-15-latest-mysql5.7-php7.1 platform: os: linux @@ -19553,10 +19211,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 11 + RUN_PART: 15 TEST_SERVER_URL: http://server services: @@ -19610,7 +19268,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-12-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-16-latest-mysql5.7-php7.1 platform: os: linux @@ -19720,10 +19378,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 12 + RUN_PART: 16 TEST_SERVER_URL: http://server services: @@ -19777,7 +19435,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-13-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-17-latest-mysql5.7-php7.1 platform: os: linux @@ -19887,10 +19545,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 13 + RUN_PART: 17 TEST_SERVER_URL: http://server services: @@ -19944,7 +19602,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-14-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-18-latest-mysql5.7-php7.1 platform: os: linux @@ -20054,10 +19712,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 14 + RUN_PART: 18 TEST_SERVER_URL: http://server services: @@ -20111,7 +19769,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-15-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-19-latest-mysql5.7-php7.1 platform: os: linux @@ -20221,10 +19879,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 15 + RUN_PART: 19 TEST_SERVER_URL: http://server services: @@ -20278,7 +19936,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-16-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-20-latest-mysql5.7-php7.1 platform: os: linux @@ -20388,10 +20046,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 16 + RUN_PART: 20 TEST_SERVER_URL: http://server services: @@ -20445,7 +20103,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-17-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-21-latest-mysql5.7-php7.1 platform: os: linux @@ -20555,10 +20213,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 17 + RUN_PART: 21 TEST_SERVER_URL: http://server services: @@ -20612,7 +20270,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-18-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-22-latest-mysql5.7-php7.1 platform: os: linux @@ -20722,10 +20380,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 18 + RUN_PART: 22 TEST_SERVER_URL: http://server services: @@ -20779,7 +20437,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-19-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-23-latest-mysql5.7-php7.1 platform: os: linux @@ -20889,10 +20547,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 19 + RUN_PART: 23 TEST_SERVER_URL: http://server services: @@ -20946,7 +20604,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-20-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-24-latest-mysql5.7-php7.1 platform: os: linux @@ -21056,10 +20714,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 20 + RUN_PART: 24 TEST_SERVER_URL: http://server services: @@ -21113,7 +20771,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-21-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-25-latest-mysql5.7-php7.1 platform: os: linux @@ -21223,10 +20881,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 21 + RUN_PART: 25 TEST_SERVER_URL: http://server services: @@ -21280,7 +20938,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-22-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-26-latest-mysql5.7-php7.1 platform: os: linux @@ -21390,10 +21048,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 22 + RUN_PART: 26 TEST_SERVER_URL: http://server services: @@ -21447,7 +21105,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-23-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-27-latest-mysql5.7-php7.1 platform: os: linux @@ -21557,10 +21215,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 23 + RUN_PART: 27 TEST_SERVER_URL: http://server services: @@ -21614,7 +21272,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-24-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-28-latest-mysql5.7-php7.1 platform: os: linux @@ -21724,10 +21382,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 24 + RUN_PART: 28 TEST_SERVER_URL: http://server services: @@ -21781,7 +21439,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-25-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-29-latest-mysql5.7-php7.1 platform: os: linux @@ -21891,10 +21549,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 25 + RUN_PART: 29 TEST_SERVER_URL: http://server services: @@ -21948,7 +21606,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-26-latest-mysql5.7-php7.1 +name: apiCoreUKey-30-30-latest-mysql5.7-php7.1 platform: os: linux @@ -22058,10 +21716,10 @@ steps: - . /var/www/owncloud/saved-settings.sh - make test-acceptance-core-api environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 30 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 26 + RUN_PART: 30 TEST_SERVER_URL: http://server services: @@ -22115,7 +21773,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-27-latest-mysql5.7-php7.1 +name: cliCoreMKey-3-1-master-mysql5.7-php7.1 platform: os: linux @@ -22137,7 +21795,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: latest + version: daily-master-qa - name: install-testrunner pull: always @@ -22148,38 +21806,6 @@ steps: - rsync -aIX /tmp/testrunner /var/www/owncloud - cp -r /var/www/owncloud/testrunner/apps/encryption /var/www/owncloud/server/apps/ -- name: install-federated - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/federated - db_host: mysql-federated - db_name: owncloud-federated - db_password: owncloud - db_type: mysql - db_username: owncloud - version: latest - -- name: configure-federation - pull: always - image: owncloudci/php:7.1 - commands: - - echo "export TEST_SERVER_FED_URL=http://federated" > /var/www/owncloud/saved-settings.sh - - cd /var/www/owncloud/federated - - php occ a:l - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=federated - - php occ log:manage --level 2 - - php occ config:list - -- name: owncloud-log-federated - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/federated/data/owncloud.log - - name: setup-server-encryption pull: always image: owncloudci/php:7.1 @@ -22205,7 +21831,7 @@ steps: commands: - cd /var/www/owncloud/server - php occ encryption:enable - - php occ encryption:select-encryption-type user-keys --yes + - php occ encryption:select-encryption-type masterkey --yes - php occ config:list - name: fix-permissions @@ -22214,8 +21840,6 @@ steps: commands: - chown -R www-data /var/www/owncloud/server - wait-for-it -t 600 server:80 - - chown -R www-data /var/www/owncloud/federated - - wait-for-it -t 600 federated:80 - name: acceptance-tests pull: always @@ -22223,12 +21847,12 @@ steps: commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-core-api + - make test-acceptance-core-cli environment: - DIVIDE_INTO_NUM_PARTS: 32 - ENCRYPTION_TYPE: user-keys + DIVIDE_INTO_NUM_PARTS: 3 + ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 27 + RUN_PART: 1 TEST_SERVER_URL: http://server services: @@ -22253,26 +21877,11 @@ services: environment: APACHE_WEBROOT: /var/www/owncloud/server -- name: federated - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/federated - -- name: mysql-federated - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud-federated - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - trigger: - cron: - - nightly + ref: + - refs/pull/** + - refs/tags/** + - refs/heads/master depends_on: - coding-standard-php7.1 @@ -22282,7 +21891,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-28-latest-mysql5.7-php7.1 +name: cliCoreMKey-3-2-master-mysql5.7-php7.1 platform: os: linux @@ -22304,7 +21913,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: latest + version: daily-master-qa - name: install-testrunner pull: always @@ -22315,38 +21924,6 @@ steps: - rsync -aIX /tmp/testrunner /var/www/owncloud - cp -r /var/www/owncloud/testrunner/apps/encryption /var/www/owncloud/server/apps/ -- name: install-federated - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/federated - db_host: mysql-federated - db_name: owncloud-federated - db_password: owncloud - db_type: mysql - db_username: owncloud - version: latest - -- name: configure-federation - pull: always - image: owncloudci/php:7.1 - commands: - - echo "export TEST_SERVER_FED_URL=http://federated" > /var/www/owncloud/saved-settings.sh - - cd /var/www/owncloud/federated - - php occ a:l - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=federated - - php occ log:manage --level 2 - - php occ config:list - -- name: owncloud-log-federated - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/federated/data/owncloud.log - - name: setup-server-encryption pull: always image: owncloudci/php:7.1 @@ -22372,7 +21949,7 @@ steps: commands: - cd /var/www/owncloud/server - php occ encryption:enable - - php occ encryption:select-encryption-type user-keys --yes + - php occ encryption:select-encryption-type masterkey --yes - php occ config:list - name: fix-permissions @@ -22381,8 +21958,6 @@ steps: commands: - chown -R www-data /var/www/owncloud/server - wait-for-it -t 600 server:80 - - chown -R www-data /var/www/owncloud/federated - - wait-for-it -t 600 federated:80 - name: acceptance-tests pull: always @@ -22390,12 +21965,12 @@ steps: commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-core-api + - make test-acceptance-core-cli environment: - DIVIDE_INTO_NUM_PARTS: 32 - ENCRYPTION_TYPE: user-keys + DIVIDE_INTO_NUM_PARTS: 3 + ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 28 + RUN_PART: 2 TEST_SERVER_URL: http://server services: @@ -22420,26 +21995,11 @@ services: environment: APACHE_WEBROOT: /var/www/owncloud/server -- name: federated - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/federated - -- name: mysql-federated - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud-federated - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - trigger: - cron: - - nightly + ref: + - refs/pull/** + - refs/tags/** + - refs/heads/master depends_on: - coding-standard-php7.1 @@ -22449,7 +22009,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-29-latest-mysql5.7-php7.1 +name: cliCoreMKey-3-3-master-mysql5.7-php7.1 platform: os: linux @@ -22471,7 +22031,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: latest + version: daily-master-qa - name: install-testrunner pull: always @@ -22482,38 +22042,6 @@ steps: - rsync -aIX /tmp/testrunner /var/www/owncloud - cp -r /var/www/owncloud/testrunner/apps/encryption /var/www/owncloud/server/apps/ -- name: install-federated - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/federated - db_host: mysql-federated - db_name: owncloud-federated - db_password: owncloud - db_type: mysql - db_username: owncloud - version: latest - -- name: configure-federation - pull: always - image: owncloudci/php:7.1 - commands: - - echo "export TEST_SERVER_FED_URL=http://federated" > /var/www/owncloud/saved-settings.sh - - cd /var/www/owncloud/federated - - php occ a:l - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=federated - - php occ log:manage --level 2 - - php occ config:list - -- name: owncloud-log-federated - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/federated/data/owncloud.log - - name: setup-server-encryption pull: always image: owncloudci/php:7.1 @@ -22539,7 +22067,7 @@ steps: commands: - cd /var/www/owncloud/server - php occ encryption:enable - - php occ encryption:select-encryption-type user-keys --yes + - php occ encryption:select-encryption-type masterkey --yes - php occ config:list - name: fix-permissions @@ -22548,8 +22076,6 @@ steps: commands: - chown -R www-data /var/www/owncloud/server - wait-for-it -t 600 server:80 - - chown -R www-data /var/www/owncloud/federated - - wait-for-it -t 600 federated:80 - name: acceptance-tests pull: always @@ -22557,12 +22083,12 @@ steps: commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-core-api + - make test-acceptance-core-cli environment: - DIVIDE_INTO_NUM_PARTS: 32 - ENCRYPTION_TYPE: user-keys + DIVIDE_INTO_NUM_PARTS: 3 + ENCRYPTION_TYPE: masterkey MAILHOG_HOST: email - RUN_PART: 29 + RUN_PART: 3 TEST_SERVER_URL: http://server services: @@ -22587,26 +22113,11 @@ services: environment: APACHE_WEBROOT: /var/www/owncloud/server -- name: federated - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/federated - -- name: mysql-federated - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud-federated - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - trigger: - cron: - - nightly + ref: + - refs/pull/** + - refs/tags/** + - refs/heads/master depends_on: - coding-standard-php7.1 @@ -22616,7 +22127,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-30-latest-mysql5.7-php7.1 +name: cliCoreUKey-3-1-master-mysql5.7-php7.1 platform: os: linux @@ -22638,7 +22149,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: latest + version: daily-master-qa - name: install-testrunner pull: always @@ -22649,38 +22160,6 @@ steps: - rsync -aIX /tmp/testrunner /var/www/owncloud - cp -r /var/www/owncloud/testrunner/apps/encryption /var/www/owncloud/server/apps/ -- name: install-federated - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/federated - db_host: mysql-federated - db_name: owncloud-federated - db_password: owncloud - db_type: mysql - db_username: owncloud - version: latest - -- name: configure-federation - pull: always - image: owncloudci/php:7.1 - commands: - - echo "export TEST_SERVER_FED_URL=http://federated" > /var/www/owncloud/saved-settings.sh - - cd /var/www/owncloud/federated - - php occ a:l - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=federated - - php occ log:manage --level 2 - - php occ config:list - -- name: owncloud-log-federated - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/federated/data/owncloud.log - - name: setup-server-encryption pull: always image: owncloudci/php:7.1 @@ -22715,8 +22194,6 @@ steps: commands: - chown -R www-data /var/www/owncloud/server - wait-for-it -t 600 server:80 - - chown -R www-data /var/www/owncloud/federated - - wait-for-it -t 600 federated:80 - name: acceptance-tests pull: always @@ -22724,12 +22201,12 @@ steps: commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-core-api + - make test-acceptance-core-cli environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 3 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 30 + RUN_PART: 1 TEST_SERVER_URL: http://server services: @@ -22754,26 +22231,11 @@ services: environment: APACHE_WEBROOT: /var/www/owncloud/server -- name: federated - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/federated - -- name: mysql-federated - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud-federated - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - trigger: - cron: - - nightly + ref: + - refs/pull/** + - refs/tags/** + - refs/heads/master depends_on: - coding-standard-php7.1 @@ -22783,7 +22245,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-31-latest-mysql5.7-php7.1 +name: cliCoreUKey-3-2-master-mysql5.7-php7.1 platform: os: linux @@ -22805,7 +22267,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: latest + version: daily-master-qa - name: install-testrunner pull: always @@ -22816,38 +22278,6 @@ steps: - rsync -aIX /tmp/testrunner /var/www/owncloud - cp -r /var/www/owncloud/testrunner/apps/encryption /var/www/owncloud/server/apps/ -- name: install-federated - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/federated - db_host: mysql-federated - db_name: owncloud-federated - db_password: owncloud - db_type: mysql - db_username: owncloud - version: latest - -- name: configure-federation - pull: always - image: owncloudci/php:7.1 - commands: - - echo "export TEST_SERVER_FED_URL=http://federated" > /var/www/owncloud/saved-settings.sh - - cd /var/www/owncloud/federated - - php occ a:l - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=federated - - php occ log:manage --level 2 - - php occ config:list - -- name: owncloud-log-federated - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/federated/data/owncloud.log - - name: setup-server-encryption pull: always image: owncloudci/php:7.1 @@ -22882,8 +22312,6 @@ steps: commands: - chown -R www-data /var/www/owncloud/server - wait-for-it -t 600 server:80 - - chown -R www-data /var/www/owncloud/federated - - wait-for-it -t 600 federated:80 - name: acceptance-tests pull: always @@ -22891,12 +22319,12 @@ steps: commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-core-api + - make test-acceptance-core-cli environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 3 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 31 + RUN_PART: 2 TEST_SERVER_URL: http://server services: @@ -22921,26 +22349,11 @@ services: environment: APACHE_WEBROOT: /var/www/owncloud/server -- name: federated - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/federated - -- name: mysql-federated - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud-federated - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - trigger: - cron: - - nightly + ref: + - refs/pull/** + - refs/tags/** + - refs/heads/master depends_on: - coding-standard-php7.1 @@ -22950,7 +22363,7 @@ depends_on: --- kind: pipeline type: docker -name: apiCoreUKey-32-32-latest-mysql5.7-php7.1 +name: cliCoreUKey-3-3-master-mysql5.7-php7.1 platform: os: linux @@ -22972,7 +22385,7 @@ steps: db_type: mysql db_username: owncloud exclude: apps/encryption - version: latest + version: daily-master-qa - name: install-testrunner pull: always @@ -22983,38 +22396,6 @@ steps: - rsync -aIX /tmp/testrunner /var/www/owncloud - cp -r /var/www/owncloud/testrunner/apps/encryption /var/www/owncloud/server/apps/ -- name: install-federated - pull: always - image: owncloudci/core - settings: - core_path: /var/www/owncloud/federated - db_host: mysql-federated - db_name: owncloud-federated - db_password: owncloud - db_type: mysql - db_username: owncloud - version: latest - -- name: configure-federation - pull: always - image: owncloudci/php:7.1 - commands: - - echo "export TEST_SERVER_FED_URL=http://federated" > /var/www/owncloud/saved-settings.sh - - cd /var/www/owncloud/federated - - php occ a:l - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=federated - - php occ log:manage --level 2 - - php occ config:list - -- name: owncloud-log-federated - pull: always - image: owncloud/ubuntu:18.04 - detach: true - commands: - - tail -f /var/www/owncloud/federated/data/owncloud.log - - name: setup-server-encryption pull: always image: owncloudci/php:7.1 @@ -23049,8 +22430,6 @@ steps: commands: - chown -R www-data /var/www/owncloud/server - wait-for-it -t 600 server:80 - - chown -R www-data /var/www/owncloud/federated - - wait-for-it -t 600 federated:80 - name: acceptance-tests pull: always @@ -23058,12 +22437,12 @@ steps: commands: - touch /var/www/owncloud/saved-settings.sh - . /var/www/owncloud/saved-settings.sh - - make test-acceptance-core-api + - make test-acceptance-core-cli environment: - DIVIDE_INTO_NUM_PARTS: 32 + DIVIDE_INTO_NUM_PARTS: 3 ENCRYPTION_TYPE: user-keys MAILHOG_HOST: email - RUN_PART: 32 + RUN_PART: 3 TEST_SERVER_URL: http://server services: @@ -23088,26 +22467,11 @@ services: environment: APACHE_WEBROOT: /var/www/owncloud/server -- name: federated - pull: always - image: owncloudci/php:7.1 - commands: - - /usr/local/bin/apachectl -e debug -D FOREGROUND - environment: - APACHE_WEBROOT: /var/www/owncloud/federated - -- name: mysql-federated - pull: always - image: mysql:5.7 - environment: - MYSQL_DATABASE: owncloud-federated - MYSQL_PASSWORD: owncloud - MYSQL_ROOT_PASSWORD: owncloud - MYSQL_USER: owncloud - trigger: - cron: - - nightly + ref: + - refs/pull/** + - refs/tags/** + - refs/heads/master depends_on: - coding-standard-php7.1 @@ -42385,134 +41749,132 @@ depends_on: - webUIMasterKey-latest-chrome-mysql5.5-php7.1 - webUIUserKeys-master-chrome-mysql5.5-php7.1 - webUIUserKeys-latest-chrome-mysql5.5-php7.1 -- apiCoreMKey-32-1-master-mysql5.7-php7.1 -- apiCoreMKey-32-2-master-mysql5.7-php7.1 -- apiCoreMKey-32-3-master-mysql5.7-php7.1 -- apiCoreMKey-32-4-master-mysql5.7-php7.1 -- apiCoreMKey-32-5-master-mysql5.7-php7.1 -- apiCoreMKey-32-6-master-mysql5.7-php7.1 -- apiCoreMKey-32-7-master-mysql5.7-php7.1 -- apiCoreMKey-32-8-master-mysql5.7-php7.1 -- apiCoreMKey-32-9-master-mysql5.7-php7.1 -- apiCoreMKey-32-10-master-mysql5.7-php7.1 -- apiCoreMKey-32-11-master-mysql5.7-php7.1 -- apiCoreMKey-32-12-master-mysql5.7-php7.1 -- apiCoreMKey-32-13-master-mysql5.7-php7.1 -- apiCoreMKey-32-14-master-mysql5.7-php7.1 -- apiCoreMKey-32-15-master-mysql5.7-php7.1 -- apiCoreMKey-32-16-master-mysql5.7-php7.1 -- apiCoreMKey-32-17-master-mysql5.7-php7.1 -- apiCoreMKey-32-18-master-mysql5.7-php7.1 -- apiCoreMKey-32-19-master-mysql5.7-php7.1 -- apiCoreMKey-32-20-master-mysql5.7-php7.1 -- apiCoreMKey-32-21-master-mysql5.7-php7.1 -- apiCoreMKey-32-22-master-mysql5.7-php7.1 -- apiCoreMKey-32-23-master-mysql5.7-php7.1 -- apiCoreMKey-32-24-master-mysql5.7-php7.1 -- apiCoreMKey-32-25-master-mysql5.7-php7.1 -- apiCoreMKey-32-26-master-mysql5.7-php7.1 -- apiCoreMKey-32-27-master-mysql5.7-php7.1 -- apiCoreMKey-32-28-master-mysql5.7-php7.1 -- apiCoreMKey-32-29-master-mysql5.7-php7.1 -- apiCoreMKey-32-30-master-mysql5.7-php7.1 -- apiCoreMKey-32-31-master-mysql5.7-php7.1 -- apiCoreMKey-32-32-master-mysql5.7-php7.1 -- apiCoreMKey-32-1-latest-mysql5.7-php7.1 -- apiCoreMKey-32-2-latest-mysql5.7-php7.1 -- apiCoreMKey-32-3-latest-mysql5.7-php7.1 -- apiCoreMKey-32-4-latest-mysql5.7-php7.1 -- apiCoreMKey-32-5-latest-mysql5.7-php7.1 -- apiCoreMKey-32-6-latest-mysql5.7-php7.1 -- apiCoreMKey-32-7-latest-mysql5.7-php7.1 -- apiCoreMKey-32-8-latest-mysql5.7-php7.1 -- apiCoreMKey-32-9-latest-mysql5.7-php7.1 -- apiCoreMKey-32-10-latest-mysql5.7-php7.1 -- apiCoreMKey-32-11-latest-mysql5.7-php7.1 -- apiCoreMKey-32-12-latest-mysql5.7-php7.1 -- apiCoreMKey-32-13-latest-mysql5.7-php7.1 -- apiCoreMKey-32-14-latest-mysql5.7-php7.1 -- apiCoreMKey-32-15-latest-mysql5.7-php7.1 -- apiCoreMKey-32-16-latest-mysql5.7-php7.1 -- apiCoreMKey-32-17-latest-mysql5.7-php7.1 -- apiCoreMKey-32-18-latest-mysql5.7-php7.1 -- apiCoreMKey-32-19-latest-mysql5.7-php7.1 -- apiCoreMKey-32-20-latest-mysql5.7-php7.1 -- apiCoreMKey-32-21-latest-mysql5.7-php7.1 -- apiCoreMKey-32-22-latest-mysql5.7-php7.1 -- apiCoreMKey-32-23-latest-mysql5.7-php7.1 -- apiCoreMKey-32-24-latest-mysql5.7-php7.1 -- apiCoreMKey-32-25-latest-mysql5.7-php7.1 -- apiCoreMKey-32-26-latest-mysql5.7-php7.1 -- apiCoreMKey-32-27-latest-mysql5.7-php7.1 -- apiCoreMKey-32-28-latest-mysql5.7-php7.1 -- apiCoreMKey-32-29-latest-mysql5.7-php7.1 -- apiCoreMKey-32-30-latest-mysql5.7-php7.1 -- apiCoreMKey-32-31-latest-mysql5.7-php7.1 -- apiCoreMKey-32-32-latest-mysql5.7-php7.1 -- apiCoreUKey-32-1-master-mysql5.7-php7.1 -- apiCoreUKey-32-2-master-mysql5.7-php7.1 -- apiCoreUKey-32-3-master-mysql5.7-php7.1 -- apiCoreUKey-32-4-master-mysql5.7-php7.1 -- apiCoreUKey-32-5-master-mysql5.7-php7.1 -- apiCoreUKey-32-6-master-mysql5.7-php7.1 -- apiCoreUKey-32-7-master-mysql5.7-php7.1 -- apiCoreUKey-32-8-master-mysql5.7-php7.1 -- apiCoreUKey-32-9-master-mysql5.7-php7.1 -- apiCoreUKey-32-10-master-mysql5.7-php7.1 -- apiCoreUKey-32-11-master-mysql5.7-php7.1 -- apiCoreUKey-32-12-master-mysql5.7-php7.1 -- apiCoreUKey-32-13-master-mysql5.7-php7.1 -- apiCoreUKey-32-14-master-mysql5.7-php7.1 -- apiCoreUKey-32-15-master-mysql5.7-php7.1 -- apiCoreUKey-32-16-master-mysql5.7-php7.1 -- apiCoreUKey-32-17-master-mysql5.7-php7.1 -- apiCoreUKey-32-18-master-mysql5.7-php7.1 -- apiCoreUKey-32-19-master-mysql5.7-php7.1 -- apiCoreUKey-32-20-master-mysql5.7-php7.1 -- apiCoreUKey-32-21-master-mysql5.7-php7.1 -- apiCoreUKey-32-22-master-mysql5.7-php7.1 -- apiCoreUKey-32-23-master-mysql5.7-php7.1 -- apiCoreUKey-32-24-master-mysql5.7-php7.1 -- apiCoreUKey-32-25-master-mysql5.7-php7.1 -- apiCoreUKey-32-26-master-mysql5.7-php7.1 -- apiCoreUKey-32-27-master-mysql5.7-php7.1 -- apiCoreUKey-32-28-master-mysql5.7-php7.1 -- apiCoreUKey-32-29-master-mysql5.7-php7.1 -- apiCoreUKey-32-30-master-mysql5.7-php7.1 -- apiCoreUKey-32-31-master-mysql5.7-php7.1 -- apiCoreUKey-32-32-master-mysql5.7-php7.1 -- apiCoreUKey-32-1-latest-mysql5.7-php7.1 -- apiCoreUKey-32-2-latest-mysql5.7-php7.1 -- apiCoreUKey-32-3-latest-mysql5.7-php7.1 -- apiCoreUKey-32-4-latest-mysql5.7-php7.1 -- apiCoreUKey-32-5-latest-mysql5.7-php7.1 -- apiCoreUKey-32-6-latest-mysql5.7-php7.1 -- apiCoreUKey-32-7-latest-mysql5.7-php7.1 -- apiCoreUKey-32-8-latest-mysql5.7-php7.1 -- apiCoreUKey-32-9-latest-mysql5.7-php7.1 -- apiCoreUKey-32-10-latest-mysql5.7-php7.1 -- apiCoreUKey-32-11-latest-mysql5.7-php7.1 -- apiCoreUKey-32-12-latest-mysql5.7-php7.1 -- apiCoreUKey-32-13-latest-mysql5.7-php7.1 -- apiCoreUKey-32-14-latest-mysql5.7-php7.1 -- apiCoreUKey-32-15-latest-mysql5.7-php7.1 -- apiCoreUKey-32-16-latest-mysql5.7-php7.1 -- apiCoreUKey-32-17-latest-mysql5.7-php7.1 -- apiCoreUKey-32-18-latest-mysql5.7-php7.1 -- apiCoreUKey-32-19-latest-mysql5.7-php7.1 -- apiCoreUKey-32-20-latest-mysql5.7-php7.1 -- apiCoreUKey-32-21-latest-mysql5.7-php7.1 -- apiCoreUKey-32-22-latest-mysql5.7-php7.1 -- apiCoreUKey-32-23-latest-mysql5.7-php7.1 -- apiCoreUKey-32-24-latest-mysql5.7-php7.1 -- apiCoreUKey-32-25-latest-mysql5.7-php7.1 -- apiCoreUKey-32-26-latest-mysql5.7-php7.1 -- apiCoreUKey-32-27-latest-mysql5.7-php7.1 -- apiCoreUKey-32-28-latest-mysql5.7-php7.1 -- apiCoreUKey-32-29-latest-mysql5.7-php7.1 -- apiCoreUKey-32-30-latest-mysql5.7-php7.1 -- apiCoreUKey-32-31-latest-mysql5.7-php7.1 -- apiCoreUKey-32-32-latest-mysql5.7-php7.1 +- apiCoreMKey-30-1-master-mysql5.7-php7.1 +- apiCoreMKey-30-2-master-mysql5.7-php7.1 +- apiCoreMKey-30-3-master-mysql5.7-php7.1 +- apiCoreMKey-30-4-master-mysql5.7-php7.1 +- apiCoreMKey-30-5-master-mysql5.7-php7.1 +- apiCoreMKey-30-6-master-mysql5.7-php7.1 +- apiCoreMKey-30-7-master-mysql5.7-php7.1 +- apiCoreMKey-30-8-master-mysql5.7-php7.1 +- apiCoreMKey-30-9-master-mysql5.7-php7.1 +- apiCoreMKey-30-10-master-mysql5.7-php7.1 +- apiCoreMKey-30-11-master-mysql5.7-php7.1 +- apiCoreMKey-30-12-master-mysql5.7-php7.1 +- apiCoreMKey-30-13-master-mysql5.7-php7.1 +- apiCoreMKey-30-14-master-mysql5.7-php7.1 +- apiCoreMKey-30-15-master-mysql5.7-php7.1 +- apiCoreMKey-30-16-master-mysql5.7-php7.1 +- apiCoreMKey-30-17-master-mysql5.7-php7.1 +- apiCoreMKey-30-18-master-mysql5.7-php7.1 +- apiCoreMKey-30-19-master-mysql5.7-php7.1 +- apiCoreMKey-30-20-master-mysql5.7-php7.1 +- apiCoreMKey-30-21-master-mysql5.7-php7.1 +- apiCoreMKey-30-22-master-mysql5.7-php7.1 +- apiCoreMKey-30-23-master-mysql5.7-php7.1 +- apiCoreMKey-30-24-master-mysql5.7-php7.1 +- apiCoreMKey-30-25-master-mysql5.7-php7.1 +- apiCoreMKey-30-26-master-mysql5.7-php7.1 +- apiCoreMKey-30-27-master-mysql5.7-php7.1 +- apiCoreMKey-30-28-master-mysql5.7-php7.1 +- apiCoreMKey-30-29-master-mysql5.7-php7.1 +- apiCoreMKey-30-30-master-mysql5.7-php7.1 +- apiCoreMKey-30-1-latest-mysql5.7-php7.1 +- apiCoreMKey-30-2-latest-mysql5.7-php7.1 +- apiCoreMKey-30-3-latest-mysql5.7-php7.1 +- apiCoreMKey-30-4-latest-mysql5.7-php7.1 +- apiCoreMKey-30-5-latest-mysql5.7-php7.1 +- apiCoreMKey-30-6-latest-mysql5.7-php7.1 +- apiCoreMKey-30-7-latest-mysql5.7-php7.1 +- apiCoreMKey-30-8-latest-mysql5.7-php7.1 +- apiCoreMKey-30-9-latest-mysql5.7-php7.1 +- apiCoreMKey-30-10-latest-mysql5.7-php7.1 +- apiCoreMKey-30-11-latest-mysql5.7-php7.1 +- apiCoreMKey-30-12-latest-mysql5.7-php7.1 +- apiCoreMKey-30-13-latest-mysql5.7-php7.1 +- apiCoreMKey-30-14-latest-mysql5.7-php7.1 +- apiCoreMKey-30-15-latest-mysql5.7-php7.1 +- apiCoreMKey-30-16-latest-mysql5.7-php7.1 +- apiCoreMKey-30-17-latest-mysql5.7-php7.1 +- apiCoreMKey-30-18-latest-mysql5.7-php7.1 +- apiCoreMKey-30-19-latest-mysql5.7-php7.1 +- apiCoreMKey-30-20-latest-mysql5.7-php7.1 +- apiCoreMKey-30-21-latest-mysql5.7-php7.1 +- apiCoreMKey-30-22-latest-mysql5.7-php7.1 +- apiCoreMKey-30-23-latest-mysql5.7-php7.1 +- apiCoreMKey-30-24-latest-mysql5.7-php7.1 +- apiCoreMKey-30-25-latest-mysql5.7-php7.1 +- apiCoreMKey-30-26-latest-mysql5.7-php7.1 +- apiCoreMKey-30-27-latest-mysql5.7-php7.1 +- apiCoreMKey-30-28-latest-mysql5.7-php7.1 +- apiCoreMKey-30-29-latest-mysql5.7-php7.1 +- apiCoreMKey-30-30-latest-mysql5.7-php7.1 +- apiCoreUKey-30-1-master-mysql5.7-php7.1 +- apiCoreUKey-30-2-master-mysql5.7-php7.1 +- apiCoreUKey-30-3-master-mysql5.7-php7.1 +- apiCoreUKey-30-4-master-mysql5.7-php7.1 +- apiCoreUKey-30-5-master-mysql5.7-php7.1 +- apiCoreUKey-30-6-master-mysql5.7-php7.1 +- apiCoreUKey-30-7-master-mysql5.7-php7.1 +- apiCoreUKey-30-8-master-mysql5.7-php7.1 +- apiCoreUKey-30-9-master-mysql5.7-php7.1 +- apiCoreUKey-30-10-master-mysql5.7-php7.1 +- apiCoreUKey-30-11-master-mysql5.7-php7.1 +- apiCoreUKey-30-12-master-mysql5.7-php7.1 +- apiCoreUKey-30-13-master-mysql5.7-php7.1 +- apiCoreUKey-30-14-master-mysql5.7-php7.1 +- apiCoreUKey-30-15-master-mysql5.7-php7.1 +- apiCoreUKey-30-16-master-mysql5.7-php7.1 +- apiCoreUKey-30-17-master-mysql5.7-php7.1 +- apiCoreUKey-30-18-master-mysql5.7-php7.1 +- apiCoreUKey-30-19-master-mysql5.7-php7.1 +- apiCoreUKey-30-20-master-mysql5.7-php7.1 +- apiCoreUKey-30-21-master-mysql5.7-php7.1 +- apiCoreUKey-30-22-master-mysql5.7-php7.1 +- apiCoreUKey-30-23-master-mysql5.7-php7.1 +- apiCoreUKey-30-24-master-mysql5.7-php7.1 +- apiCoreUKey-30-25-master-mysql5.7-php7.1 +- apiCoreUKey-30-26-master-mysql5.7-php7.1 +- apiCoreUKey-30-27-master-mysql5.7-php7.1 +- apiCoreUKey-30-28-master-mysql5.7-php7.1 +- apiCoreUKey-30-29-master-mysql5.7-php7.1 +- apiCoreUKey-30-30-master-mysql5.7-php7.1 +- apiCoreUKey-30-1-latest-mysql5.7-php7.1 +- apiCoreUKey-30-2-latest-mysql5.7-php7.1 +- apiCoreUKey-30-3-latest-mysql5.7-php7.1 +- apiCoreUKey-30-4-latest-mysql5.7-php7.1 +- apiCoreUKey-30-5-latest-mysql5.7-php7.1 +- apiCoreUKey-30-6-latest-mysql5.7-php7.1 +- apiCoreUKey-30-7-latest-mysql5.7-php7.1 +- apiCoreUKey-30-8-latest-mysql5.7-php7.1 +- apiCoreUKey-30-9-latest-mysql5.7-php7.1 +- apiCoreUKey-30-10-latest-mysql5.7-php7.1 +- apiCoreUKey-30-11-latest-mysql5.7-php7.1 +- apiCoreUKey-30-12-latest-mysql5.7-php7.1 +- apiCoreUKey-30-13-latest-mysql5.7-php7.1 +- apiCoreUKey-30-14-latest-mysql5.7-php7.1 +- apiCoreUKey-30-15-latest-mysql5.7-php7.1 +- apiCoreUKey-30-16-latest-mysql5.7-php7.1 +- apiCoreUKey-30-17-latest-mysql5.7-php7.1 +- apiCoreUKey-30-18-latest-mysql5.7-php7.1 +- apiCoreUKey-30-19-latest-mysql5.7-php7.1 +- apiCoreUKey-30-20-latest-mysql5.7-php7.1 +- apiCoreUKey-30-21-latest-mysql5.7-php7.1 +- apiCoreUKey-30-22-latest-mysql5.7-php7.1 +- apiCoreUKey-30-23-latest-mysql5.7-php7.1 +- apiCoreUKey-30-24-latest-mysql5.7-php7.1 +- apiCoreUKey-30-25-latest-mysql5.7-php7.1 +- apiCoreUKey-30-26-latest-mysql5.7-php7.1 +- apiCoreUKey-30-27-latest-mysql5.7-php7.1 +- apiCoreUKey-30-28-latest-mysql5.7-php7.1 +- apiCoreUKey-30-29-latest-mysql5.7-php7.1 +- apiCoreUKey-30-30-latest-mysql5.7-php7.1 +- cliCoreMKey-3-1-master-mysql5.7-php7.1 +- cliCoreMKey-3-2-master-mysql5.7-php7.1 +- cliCoreMKey-3-3-master-mysql5.7-php7.1 +- cliCoreUKey-3-1-master-mysql5.7-php7.1 +- cliCoreUKey-3-2-master-mysql5.7-php7.1 +- cliCoreUKey-3-3-master-mysql5.7-php7.1 - webUIcoreMKey-27-1-master-chrome-mysql5.7-php7.1 - webUIcoreMKey-27-2-master-chrome-mysql5.7-php7.1 - webUIcoreMKey-27-3-master-chrome-mysql5.7-php7.1 diff --git a/Makefile b/Makefile index f51bf92d..c9e79e0e 100644 --- a/Makefile +++ b/Makefile @@ -131,6 +131,11 @@ test-acceptance-core-api: ## Run core API acceptance tests test-acceptance-core-api: $(acceptance_test_deps) BEHAT_BIN=$(BEHAT_BIN) ../../tests/acceptance/run.sh --remote --type api -c ../../tests/acceptance/config/behat.yml --tags '~@skipOnEncryption&&~@skipOnEncryptionType:${ENCRYPTION_TYPE}&&~@skip' +.PHONY: test-acceptance-core-cli +test-acceptance-core-cli: ## Run core CLI acceptance tests +test-acceptance-core-cli: $(acceptance_test_deps) + BEHAT_BIN=$(BEHAT_BIN) ../../tests/acceptance/run.sh --remote --type cli -c ../../tests/acceptance/config/behat.yml --tags '~@skipOnEncryption&&~@skipOnEncryptionType:${ENCRYPTION_TYPE}&&~@skip' + .PHONY: test-acceptance-core-webui test-acceptance-core-webui: ## Run core webUI acceptance tests test-acceptance-core-webui: $(acceptance_test_deps)