From 187ca26226f994ce7ae93b27725bbb02428e7651 Mon Sep 17 00:00:00 2001 From: Patrick Jahns Date: Wed, 22 Aug 2018 12:46:58 +0200 Subject: [PATCH 01/11] use official docker container for federaated servers --- .drone.yml | 79 ++++++++++++++++++------------------------------------ 1 file changed, 26 insertions(+), 53 deletions(-) diff --git a/.drone.yml b/.drone.yml index c58230e7c10a..ac87c2fb28a6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,44 +10,6 @@ clone: depth: 50 pipeline: - install-fed-server: - image: owncloudci/core - pull: true - version: ${FEDERATION_OC_VERSION} - core_path: /drone/fed-server - when: - matrix: - USE_FEDERATED_SERVER: true - - configure-federation-server: - image: owncloudci/php:${PHP_VERSION} - pull: true - commands: - - cd /drone/fed-server - - php occ a:l - - php occ a:e testing - - php occ a:l - - php occ config:system:set trusted_domains 1 --value=server - - php occ config:system:set trusted_domains 2 --value=federated - - php occ log:manage --level 0 - - php occ config:list - - echo "export TEST_SERVER_FED_URL=https://federated" > /drone/saved-settings.sh - - php occ security:certificates:import /drone/server.crt - - php occ security:certificates:import /drone/federated.crt - - php occ security:certificates - when: - matrix: - USE_FEDERATED_SERVER: true - - fix-permissions-federation-server: - image: owncloudci/php:${PHP_VERSION} - pull: true - commands: - - chown www-data /drone/fed-server -R - when: - matrix: - USE_FEDERATED_SERVER: true - restore: image: plugins/s3-cache:1 pull: true @@ -355,26 +317,23 @@ pipeline: matrix: OWNCLOUD_LOG: true - federated-log: - image: owncloud/ubuntu:16.04 - detach: true - pull: true - commands: - - tail -f /drone/fed-server/data/owncloud.log - when: - matrix: - OWNCLOUD_LOG: true - USE_FEDERATED_SERVER: true - api-acceptance-tests: image: owncloudci/php:${PHP_VERSION} pull: true environment: +<<<<<<< HEAD - TEST_SERVER_URL=https://server commands: - touch /drone/saved-settings.sh - . /drone/saved-settings.sh - make test-acceptance-api TESTING_REMOTE_SYSTEM=true +======= + - TEST_SERVER_URL=http://server + - TEST_FEDERATION=${TEST_FEDERATION} + commands: + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated"; fi + - ./tests/drone/test-acceptance.sh --remote +>>>>>>> use official docker container for federaated servers when: matrix: TEST_SUITE: api @@ -403,10 +362,16 @@ pipeline: - TEST_SERVER_URL=https://server - PLATFORM=Linux - MAILHOG_HOST=email + - TEST_FEDERATION=${TEST_FEDERATION} commands: +<<<<<<< HEAD - touch /drone/saved-settings.sh - . /drone/saved-settings.sh - make test-acceptance-webui TESTING_REMOTE_SYSTEM=true +======= + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated"; fi + - ./tests/drone/test-acceptance.sh --remote +>>>>>>> use official docker container for federaated servers when: matrix: TEST_SUITE: selenium @@ -517,18 +482,23 @@ services: USE_SERVER: true federated: - image: owncloudci/php:${PHP_VERSION} + image: owncloud/server pull: true environment: +<<<<<<< HEAD - APACHE_WEBROOT=/drone/fed-server/ - APACHE_CONFIG_TEMPLATE=ssl - APACHE_SSL_CERT_CN=federated - APACHE_SSL_CERT=/drone/federated.crt - APACHE_SSL_KEY=/drone/federated.key command: [ "/usr/local/bin/apachectl", "-e", "debug" , "-D", "FOREGROUND" ] +======= + - OWNCLOUD_APPS_INSTALL=https://github.com/owncloud/testing/releases/download/latest/testing.tar.gz + - OWNCLOUD_APPS_ENABLE=testing +>>>>>>> use official docker container for federaated servers when: matrix: - USE_FEDERATED_SERVER: true + TEST_FEDERATION: true apache_webdav: image: owncloudci/php @@ -803,8 +773,7 @@ matrix: BEHAT_SUITE: apiFederation DB_TYPE: mariadb USE_SERVER: true - USE_FEDERATED_SERVER: true - FEDERATION_OC_VERSION: daily-stable10-qa + TEST_FEDERATION: true INSTALL_SERVER: true CHOWN_SERVER: true OWNCLOUD_LOG: true @@ -1158,6 +1127,10 @@ matrix: BEHAT_SUITE: webUISharingNotifications DB_TYPE: mariadb USE_SERVER: true +<<<<<<< HEAD +======= + TEST_FEDERATION: trues +>>>>>>> use official docker container for federaated servers INSTALL_SERVER: true CHOWN_SERVER: true OWNCLOUD_LOG: true From 882cbb1edc8eb95fa7ebf8352f1ea39a916ef3bb Mon Sep 17 00:00:00 2001 From: Patrick Jahns Date: Fri, 31 Aug 2018 17:15:31 +0200 Subject: [PATCH 02/11] try a workaround to start federated server with just port 80 exposed --- .drone.yml | 59 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/.drone.yml b/.drone.yml index ac87c2fb28a6..815672e37162 100644 --- a/.drone.yml +++ b/.drone.yml @@ -127,6 +127,32 @@ pipeline: matrix: INSTALL_TESTING_APP: true + federated: + image: toolhippie/docker:latest + pull: true + detach: true + environment: + - DOCKER_HOST=tcp://docker:2375 + commands: + - | + docker run -p 8000:80 \ + -e DEBUG=true \ + -e OWNCLOUD_APPS_INSTALL=https://github.com/owncloud/testing/releases/download/latest/testing.tar.gz \ + -e OWNCLOUD_APPS_ENABLE=testing \ + owncloud/server:latest + when: + matrix: + TEST_FEDERATION: true + + wait-for-federated-server: + image: owncloud/ubuntu:latest + pull: true + commands: + - wait-for-it -t 600 docker:8000 + when: + matrix: + TEST_FEDERATION: true + prepare-objectstore: image: owncloudci/php:${PHP_VERSION} pull: true @@ -321,19 +347,11 @@ pipeline: image: owncloudci/php:${PHP_VERSION} pull: true environment: -<<<<<<< HEAD - TEST_SERVER_URL=https://server - commands: - - touch /drone/saved-settings.sh - - . /drone/saved-settings.sh - - make test-acceptance-api TESTING_REMOTE_SYSTEM=true -======= - - TEST_SERVER_URL=http://server - TEST_FEDERATION=${TEST_FEDERATION} commands: - - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated"; fi - - ./tests/drone/test-acceptance.sh --remote ->>>>>>> use official docker container for federaated servers + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://docker:8000"; fi + - make test-acceptance-api TESTING_REMOTE_SYSTEM=true when: matrix: TEST_SUITE: api @@ -364,14 +382,8 @@ pipeline: - MAILHOG_HOST=email - TEST_FEDERATION=${TEST_FEDERATION} commands: -<<<<<<< HEAD - - touch /drone/saved-settings.sh - - . /drone/saved-settings.sh + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://docker:8000"; fi - make test-acceptance-webui TESTING_REMOTE_SYSTEM=true -======= - - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated"; fi - - ./tests/drone/test-acceptance.sh --remote ->>>>>>> use official docker container for federaated servers when: matrix: TEST_SUITE: selenium @@ -485,17 +497,17 @@ services: image: owncloud/server pull: true environment: -<<<<<<< HEAD - APACHE_WEBROOT=/drone/fed-server/ - APACHE_CONFIG_TEMPLATE=ssl - APACHE_SSL_CERT_CN=federated - APACHE_SSL_CERT=/drone/federated.crt - APACHE_SSL_KEY=/drone/federated.key - command: [ "/usr/local/bin/apachectl", "-e", "debug" , "-D", "FOREGROUND" ] -======= - OWNCLOUD_APPS_INSTALL=https://github.com/owncloud/testing/releases/download/latest/testing.tar.gz - OWNCLOUD_APPS_ENABLE=testing ->>>>>>> use official docker container for federaated servers + command: [ "/usr/local/bin/apachectl", "-e", "debug" , "-D", "FOREGROUND" ] + + docker: + image: docker:18.04-dind when: matrix: TEST_FEDERATION: true @@ -1127,10 +1139,7 @@ matrix: BEHAT_SUITE: webUISharingNotifications DB_TYPE: mariadb USE_SERVER: true -<<<<<<< HEAD -======= - TEST_FEDERATION: trues ->>>>>>> use official docker container for federaated servers + TEST_FEDERATION: true INSTALL_SERVER: true CHOWN_SERVER: true OWNCLOUD_LOG: true From 863047fda5354fc7fc230e1c34c6f929cf225231 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Tue, 12 Feb 2019 12:28:08 +0545 Subject: [PATCH 03/11] fix conflicts --- .drone.yml | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/.drone.yml b/.drone.yml index 815672e37162..562cd86fdc7e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -493,25 +493,21 @@ services: matrix: USE_SERVER: true - federated: - image: owncloud/server - pull: true - environment: - - APACHE_WEBROOT=/drone/fed-server/ - - APACHE_CONFIG_TEMPLATE=ssl - - APACHE_SSL_CERT_CN=federated - - APACHE_SSL_CERT=/drone/federated.crt - - APACHE_SSL_KEY=/drone/federated.key - - OWNCLOUD_APPS_INSTALL=https://github.com/owncloud/testing/releases/download/latest/testing.tar.gz - - OWNCLOUD_APPS_ENABLE=testing - command: [ "/usr/local/bin/apachectl", "-e", "debug" , "-D", "FOREGROUND" ] - docker: image: docker:18.04-dind when: matrix: TEST_FEDERATION: true + wait-for-federated-server: + image: owncloud/ubuntu:latest + pull: true + commands: + - wait-for-it -t 600 docker:8000 + when: + matrix: + TEST_FEDERATION: true + apache_webdav: image: owncloudci/php pull: true From a237d3bdb8930a5dba249bd119ef3f2650b1e40e Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 13 Feb 2019 15:45:07 +0545 Subject: [PATCH 04/11] delete one wait-for-federated-server --- .drone.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index 562cd86fdc7e..9c1e978373f4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -144,15 +144,6 @@ pipeline: matrix: TEST_FEDERATION: true - wait-for-federated-server: - image: owncloud/ubuntu:latest - pull: true - commands: - - wait-for-it -t 600 docker:8000 - when: - matrix: - TEST_FEDERATION: true - prepare-objectstore: image: owncloudci/php:${PHP_VERSION} pull: true From 98dbcf3c03662fab4acf69285dea826e620ecc0c Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 13 Feb 2019 16:59:20 +0545 Subject: [PATCH 05/11] fix naming --- .drone.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index 9c1e978373f4..aaebdcb7fecd 100644 --- a/.drone.yml +++ b/.drone.yml @@ -144,6 +144,15 @@ pipeline: matrix: TEST_FEDERATION: true + wait-for-federated-server: + image: owncloud/ubuntu:latest + pull: true + commands: + - wait-for-it -t 600 federated:80 + when: + matrix: + TEST_FEDERATION: true + prepare-objectstore: image: owncloudci/php:${PHP_VERSION} pull: true @@ -341,7 +350,7 @@ pipeline: - TEST_SERVER_URL=https://server - TEST_FEDERATION=${TEST_FEDERATION} commands: - - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://docker:8000"; fi + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated"; fi - make test-acceptance-api TESTING_REMOTE_SYSTEM=true when: matrix: @@ -373,7 +382,7 @@ pipeline: - MAILHOG_HOST=email - TEST_FEDERATION=${TEST_FEDERATION} commands: - - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://docker:8000"; fi + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated"; fi - make test-acceptance-webui TESTING_REMOTE_SYSTEM=true when: matrix: @@ -490,15 +499,6 @@ services: matrix: TEST_FEDERATION: true - wait-for-federated-server: - image: owncloud/ubuntu:latest - pull: true - commands: - - wait-for-it -t 600 docker:8000 - when: - matrix: - TEST_FEDERATION: true - apache_webdav: image: owncloudci/php pull: true From 50c042e59c4b0f271464c12b37f52be020067128 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 13 Feb 2019 17:00:31 +0545 Subject: [PATCH 06/11] strip down matrix --- .drone.yml | 660 +---------------------------------------------------- 1 file changed, 1 insertion(+), 659 deletions(-) diff --git a/.drone.yml b/.drone.yml index aaebdcb7fecd..e1a505b85ac7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -550,222 +550,7 @@ services: matrix: include: - # frontend - - TEST_SUITE: javascript - PHP_VERSION: 7.1 - COVERAGE: true - - # owncloud-coding-standard - - PHP_VERSION: 7.3 - TEST_SUITE: owncloud-coding-standard - - # phan (runs multiple PHP v7.* to provide syntax checks of each PHP version) - - TEST_SUITE: phan - PHP_VERSION: 7.1 - - # phpstan - - TEST_SUITE: phpstan - PHP_VERSION: 7.1 - INSTALL_SERVER: true - - # Litmus - - PHP_VERSION: 7.1 - USE_SERVER: true - TEST_SUITE: litmus - INSTALL_SERVER: true - OWNCLOUD_LOG: true - - # Unit Tests - - PHP_VERSION: 7.1 - DB_TYPE: mysql - TEST_SUITE: phpunit - COVERAGE: true - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - DB_TYPE: mysql - # mb4 support, with innodb_file_format=Barracuda - MYSQL_IMAGE: mysql:5.7 - TEST_SUITE: phpunit - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - # mb4 support by default - DB_TYPE: mysql8 - TEST_SUITE: phpunit - COVERAGE: false - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - -# - PHP_VERSION: 7.1 -# DB_TYPE: mariadb -# TEST_SUITE: phpunit -# INSTALL_SERVER: true - - - PHP_VERSION: 7.1 - DB_TYPE: postgres - POSTGRES_IMAGE: postgres:9.4 - TEST_SUITE: phpunit - COVERAGE: true - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - DB_TYPE: postgres - POSTGRES_IMAGE: postgres:10.3 - TEST_SUITE: phpunit - COVERAGE: true - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - DB_TYPE: mariadb - # mb4 support by default - MARIADB_IMAGE: mariadb:10.3 - TEST_SUITE: phpunit - COVERAGE: true - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - DB_TYPE: oracle - TEST_SUITE: phpunit - COVERAGE: true - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - DB_TYPE: sqlite - TEST_SUITE: phpunit - COVERAGE: true - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - # PHP 7.2 - - PHP_VERSION: 7.2 - DB_TYPE: sqlite - TEST_SUITE: phpunit - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.2 - DB_TYPE: mariadb - TEST_SUITE: phpunit - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - #- PHP_VERSION: 7.2 - # DB_TYPE: mysql - # TEST_SUITE: phpunit - # INSTALL_SERVER: true - # - #- PHP_VERSION: 7.2 - # DB_TYPE: postgres - # TEST_SUITE: phpunit - # INSTALL_SERVER: true - # - # - PHP_VERSION: 7.2 - # DB_TYPE: oracle - # TEST_SUITE: phpunit - # INSTALL_SERVER: true - - # PHP 7.3 - - PHP_VERSION: 7.3 - DB_TYPE: sqlite - TEST_SUITE: phpunit - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.3 - DB_TYPE: mariadb - TEST_SUITE: phpunit - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - # test on objectstore - - PHP_VERSION: 7.1 - DB_TYPE: sqlite - TEST_SUITE: phpunit - COVERAGE: true - TEST_OBJECTSTORAGE: true - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - - # Files External - - PHP_VERSION: 7.1 - TEST_SUITE: phpunit - COVERAGE: true - DB_TYPE: sqlite - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - FILES_EXTERNAL_TYPE: webdav_apache - - - PHP_VERSION: 7.1 - TEST_SUITE: phpunit - COVERAGE: true - DB_TYPE: sqlite - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - FILES_EXTERNAL_TYPE: smb_samba - - - PHP_VERSION: 7.1 - TEST_SUITE: phpunit - COVERAGE: true - DB_TYPE: sqlite - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - FILES_EXTERNAL_TYPE: smb_windows - - - PHP_VERSION: 7.1 - TEST_SUITE: phpunit - COVERAGE: true - DB_TYPE: sqlite - INSTALL_SERVER: true - INSTALL_TESTING_APP: true - FILES_EXTERNAL_TYPE: swift - # API Acceptance tests - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiMain - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiCapabilities - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiComments - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiFavorites - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - PHP_VERSION: 7.1 TEST_SUITE: api @@ -778,349 +563,7 @@ matrix: OWNCLOUD_LOG: true INSTALL_TESTING_APP: true - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiProvisioning-v1 - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiProvisioning-v2 - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiSharees - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiShareManagement - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiShareOperations - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiSharingNotifications - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - INSTALL_NOTIFICATIONS_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiTags - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiTrashbin - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiVersions - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiWebdavLocks - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiWebdavMove - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiWebdavOperations - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiWebdavProperties - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: api - BEHAT_SUITE: apiWebdavUpload - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - # CLI Provisioning Acceptance tests - - PHP_VERSION: 7.1 - TEST_SUITE: cli - BEHAT_SUITE: cliProvisioning - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - USE_EMAIL: true - - # CLI Main Acceptance tests - - PHP_VERSION: 7.1 - TEST_SUITE: cli - BEHAT_SUITE: cliMain - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - # CLI Background Acceptance tests - - PHP_VERSION: 7.1 - TEST_SUITE: cli - BEHAT_SUITE: cliBackground - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - # CLI Trashbin Acceptance tests - - PHP_VERSION: 7.1 - TEST_SUITE: cli - BEHAT_SUITE: cliTrashbin - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - # UI Acceptance tests - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIAdminSettings - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - USE_EMAIL: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIComments - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUICreateDelete - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIFavorites - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIFiles - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUILogin - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - USE_EMAIL: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIMoveFilesFolders - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIPersonalSettings - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - USE_EMAIL: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIRenameFiles - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIRenameFolders - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIRestrictSharing - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUISharingAcceptShares - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUISharingExternal - DB_TYPE: mariadb - USE_SERVER: true - USE_FEDERATED_SERVER: true - FEDERATION_OC_VERSION: daily-stable10-qa - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - USE_EMAIL: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUISharingInternalGroups - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUISharingInternalUsers - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - + - PHP_VERSION: 7.1 TEST_SUITE: selenium BEHAT_SUITE: webUISharingNotifications @@ -1133,104 +576,3 @@ matrix: INSTALL_TESTING_APP: true USE_EMAIL: true INSTALL_NOTIFICATIONS_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUISharingPublic - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - USE_EMAIL: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUITags - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUITrashbin - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIUpload - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIWebdavLocks - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - - PHP_VERSION: 7.1 - TEST_SUITE: selenium - BEHAT_SUITE: webUIWebdavLockProtection - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - INSTALL_TESTING_APP: true - - # caldav test - - PHP_VERSION: 7.1 - TEST_SUITE: caldav - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - CALDAV_CARDDAV_JOB: true - - # carddav test - - PHP_VERSION: 7.1 - TEST_SUITE: carddav - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - CALDAV_CARDDAV_JOB: true - - # caldav-old-endpoint test - - PHP_VERSION: 7.1 - TEST_SUITE: caldav-old-endpoint - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - CALDAV_CARDDAV_JOB: true - - # carddav-old-endpoint test - - PHP_VERSION: 7.1 - TEST_SUITE: carddav-old-endpoint - DB_TYPE: mariadb - USE_SERVER: true - INSTALL_SERVER: true - CHOWN_SERVER: true - OWNCLOUD_LOG: true - CALDAV_CARDDAV_JOB: true From 653b318d46c99fe825690512c55e096ad1d43885 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 13 Feb 2019 17:05:07 +0545 Subject: [PATCH 07/11] try without waiting --- .drone.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index e1a505b85ac7..479073b8e63c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -144,15 +144,6 @@ pipeline: matrix: TEST_FEDERATION: true - wait-for-federated-server: - image: owncloud/ubuntu:latest - pull: true - commands: - - wait-for-it -t 600 federated:80 - when: - matrix: - TEST_FEDERATION: true - prepare-objectstore: image: owncloudci/php:${PHP_VERSION} pull: true From 680e827b773c4dd2cf1aabe716665d2f8651c551 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Wed, 13 Feb 2019 17:14:55 +0545 Subject: [PATCH 08/11] use correct port number --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 479073b8e63c..6023d90f6503 100644 --- a/.drone.yml +++ b/.drone.yml @@ -341,7 +341,7 @@ pipeline: - TEST_SERVER_URL=https://server - TEST_FEDERATION=${TEST_FEDERATION} commands: - - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated"; fi + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated:8000"; fi - make test-acceptance-api TESTING_REMOTE_SYSTEM=true when: matrix: @@ -373,7 +373,7 @@ pipeline: - MAILHOG_HOST=email - TEST_FEDERATION=${TEST_FEDERATION} commands: - - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated"; fi + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated:8000"; fi - make test-acceptance-webui TESTING_REMOTE_SYSTEM=true when: matrix: From f15a6db90e0cc832b4a10b0ebdd6df926dd4e413 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 14 Feb 2019 15:49:07 +0545 Subject: [PATCH 09/11] use docker host --- .drone.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6023d90f6503..492fb5bec00b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -144,6 +144,15 @@ pipeline: matrix: TEST_FEDERATION: true + wait-for-federated-server: + image: owncloud/ubuntu:latest + pull: true + commands: + - wait-for-it -t 600 docker:8000 + when: + matrix: + TEST_FEDERATION: true + prepare-objectstore: image: owncloudci/php:${PHP_VERSION} pull: true @@ -341,7 +350,7 @@ pipeline: - TEST_SERVER_URL=https://server - TEST_FEDERATION=${TEST_FEDERATION} commands: - - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated:8000"; fi + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://docker:8000"; fi - make test-acceptance-api TESTING_REMOTE_SYSTEM=true when: matrix: @@ -373,7 +382,7 @@ pipeline: - MAILHOG_HOST=email - TEST_FEDERATION=${TEST_FEDERATION} commands: - - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://federated:8000"; fi + - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://docker:8000"; fi - make test-acceptance-webui TESTING_REMOTE_SYSTEM=true when: matrix: From b98f9eb7e7a0830828ecd21ad2145b8dc70832a8 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 14 Feb 2019 15:52:42 +0545 Subject: [PATCH 10/11] current oC docker uses port 8080 --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 492fb5bec00b..7e0d0a9bfccf 100644 --- a/.drone.yml +++ b/.drone.yml @@ -135,7 +135,7 @@ pipeline: - DOCKER_HOST=tcp://docker:2375 commands: - | - docker run -p 8000:80 \ + docker run -p 8000:8080 \ -e DEBUG=true \ -e OWNCLOUD_APPS_INSTALL=https://github.com/owncloud/testing/releases/download/latest/testing.tar.gz \ -e OWNCLOUD_APPS_ENABLE=testing \ From 00c5ac51b0b6909ae67d48fef844656d0a10b2c3 Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Thu, 14 Feb 2019 16:31:14 +0545 Subject: [PATCH 11/11] no SSL --- .drone.yml | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/.drone.yml b/.drone.yml index 7e0d0a9bfccf..236afa170d9d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -108,9 +108,6 @@ pipeline: - php occ config:system:set trusted_domains 2 --value=federated - php occ log:manage --level 0 - php occ config:list - - php occ security:certificates:import /drone/server.crt - - php occ security:certificates:import /drone/federated.crt - - php occ security:certificates when: matrix: INSTALL_SERVER: true @@ -260,8 +257,8 @@ pipeline: - echo 'Sharing a folder ..' - OC_PASS=123456 php occ user:add --password-from-env user1 - chown www-data /drone/src -R - - curl -k -s -u user1:123456 -X MKCOL 'https://server/remote.php/webdav/new_folder' - - curl -k -s -u user1:123456 "https://server/ocs/v2.php/apps/files_sharing/api/v1/shares" --data 'path=/new_folder&shareType=0&permissions=15&name=new_folder&shareWith=admin' + - curl -k -s -u user1:123456 -X MKCOL 'http://server/remote.php/webdav/new_folder' + - curl -k -s -u user1:123456 "http://server/ocs/v2.php/apps/files_sharing/api/v1/shares" --data 'path=/new_folder&shareType=0&permissions=15&name=new_folder&shareWith=admin' when: matrix: TEST_SUITE: litmus @@ -270,7 +267,7 @@ pipeline: image: owncloud/litmus pull: true environment: - - LITMUS_URL=https://server/remote.php/webdav + - LITMUS_URL=http://server/remote.php/webdav - LITMUS_USERNAME=admin - LITMUS_PASSWORD=admin when: @@ -281,7 +278,7 @@ pipeline: image: owncloud/litmus pull: true environment: - - LITMUS_URL=https://server/remote.php/dav/files/admin + - LITMUS_URL=http://server/remote.php/dav/files/admin - LITMUS_USERNAME=admin - LITMUS_PASSWORD=admin when: @@ -292,7 +289,7 @@ pipeline: image: owncloud/litmus pull: true environment: - - LITMUS_URL=https://server/remote.php/dav/files/admin/local_storage/ + - LITMUS_URL=http://server/remote.php/dav/files/admin/local_storage/ - LITMUS_USERNAME=admin - LITMUS_PASSWORD=admin when: @@ -303,7 +300,7 @@ pipeline: image: owncloud/litmus pull: true environment: - - LITMUS_URL=https://server/remote.php/webdav/local_storage/ + - LITMUS_URL=http://server/remote.php/webdav/local_storage/ - LITMUS_USERNAME=admin - LITMUS_PASSWORD=admin when: @@ -314,7 +311,7 @@ pipeline: image: owncloud/litmus pull: true environment: - - LITMUS_URL=https://server/remote.php/dav/files/admin/new_folder/ + - LITMUS_URL=http://server/remote.php/dav/files/admin/new_folder/ - LITMUS_USERNAME=admin - LITMUS_PASSWORD=admin when: @@ -325,7 +322,7 @@ pipeline: image: owncloud/litmus pull: true environment: - - LITMUS_URL=https://server/remote.php/webdav/new_folder/ + - LITMUS_URL=http://server/remote.php/webdav/new_folder/ - LITMUS_USERNAME=admin - LITMUS_PASSWORD=admin when: @@ -347,7 +344,7 @@ pipeline: image: owncloudci/php:${PHP_VERSION} pull: true environment: - - TEST_SERVER_URL=https://server + - TEST_SERVER_URL=http://server - TEST_FEDERATION=${TEST_FEDERATION} commands: - if [ "${TEST_FEDERATION}" != "" ]; then export TEST_SERVER_FED_URL="http://docker:8000"; fi @@ -360,7 +357,7 @@ pipeline: image: owncloudci/php:${PHP_VERSION} pull: true environment: - - TEST_SERVER_URL=https://server + - TEST_SERVER_URL=http://server - MAILHOG_HOST=email commands: - touch /drone/saved-settings.sh @@ -377,7 +374,7 @@ pipeline: - BROWSER=chrome - SELENIUM_HOST=selenium - SELENIUM_PORT=4444 - - TEST_SERVER_URL=https://server + - TEST_SERVER_URL=http://server - PLATFORM=Linux - MAILHOG_HOST=email - TEST_FEDERATION=${TEST_FEDERATION} @@ -484,10 +481,6 @@ services: pull: true environment: - APACHE_WEBROOT=/drone/src/ - - APACHE_CONFIG_TEMPLATE=ssl - - APACHE_SSL_CERT_CN=server - - APACHE_SSL_CERT=/drone/server.crt - - APACHE_SSL_KEY=/drone/server.key command: [ "/usr/local/bin/apachectl", "-e", "debug" , "-D", "FOREGROUND" ] when: matrix: