From 8ff4d95ae84beccf23fbc49b65eb6ed113db588b Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Tue, 13 Sep 2016 17:40:19 +0200 Subject: [PATCH] Move Travis tests to DroneCI Should give us some quicker test execution speed as we're not limited by Travis Explicitly invoke with "bash" Install instance already Use newest litmus container --- .drone.yml | 85 ++++++++++++++++++++++ .travis.yml | 58 --------------- apps/dav/tests/travis/litmus-v1/install.sh | 12 --- apps/dav/tests/travis/litmus-v2/install.sh | 12 --- 4 files changed, 85 insertions(+), 82 deletions(-) delete mode 100644 .travis.yml delete mode 100644 apps/dav/tests/travis/litmus-v1/install.sh delete mode 100644 apps/dav/tests/travis/litmus-v2/install.sh diff --git a/.drone.yml b/.drone.yml index a3a6174490..e1a4e7ed91 100644 --- a/.drone.yml +++ b/.drone.yml @@ -25,6 +25,82 @@ pipeline: matrix: DB: NODB PHP: 5.5 + app-check-code: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ app:check-code admin_audit + - ./occ app:check-code comments + - ./occ app:check-code federation + - ./occ app:check-code workflowengine + when: + matrix: + TESTS: app-check-code + syntax-php5.4: + image: nextcloudci/php5.4:1.0.14 + commands: + - composer install + - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php5.4 + syntax-php5.5: + image: nextcloudci/php5.5:1.0.14 + commands: + - composer install + - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php5.5 + syntax-php5.6: + image: nextcloudci/php5.6:php5.6-2 + commands: + - composer install + - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php5.6 + syntax-php7.0: + image: nextcloudci/php7.0:php7.0-2 + commands: + - composer install + - ./lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php . + when: + matrix: + TESTS: syntax-php7.0 + litmus-v1: + image: nextcloudci/litmus-php7.0:litmus-php7.0-2 + commands: + - bash tests/travis/install.sh sqlite + - bash apps/dav/tests/travis/litmus-v1/script.sh + when: + matrix: + TESTS: litmus-v1 + litmus-v2: + image: nextcloudci/litmus-php7.0:litmus-php7.0-2 + commands: + - bash tests/travis/install.sh sqlite + - bash apps/dav/tests/travis/litmus-v2/script.sh + when: + matrix: + TESTS: litmus-v2 + caldavtester: + image: nextcloudci/litmus-php7.0:litmus-php7.0-2 + commands: + - bash tests/travis/install.sh sqlite + - bash apps/dav/tests/travis/caldav/install.sh + - bash apps/dav/tests/travis/caldav/script.sh + when: + matrix: + TESTS: caldavtester + carddavtester: + image: nextcloudci/litmus-php7.0:litmus-php7.0-2 + commands: + - bash tests/travis/install.sh sqlite + - bash apps/dav/tests/travis/carddav/install.sh + - bash apps/dav/tests/travis/carddav/script.sh + when: + matrix: + TESTS: carddavtester nodb-php5.6: image: nextcloudci/php5.6:1.0.6 commands: @@ -107,6 +183,15 @@ matrix: include: - TESTS: integration - TESTS: jsunit + - TESTS: app-check-code + - TESTS: syntax-php5.4 + - TESTS: syntax-php5.5 + - TESTS: syntax-php5.6 + - TESTS: syntax-php7.0 + - TESTS: litmus-v1 + - TESTS: litmus-v2 + - TESTS: caldavtester + - TESTS: carddavtester - DB: NODB PHP: 5.4 - DB: NODB diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index fbbff9fc16..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,58 +0,0 @@ -sudo: false -language: php -php: - - 5.4 - -env: - global: - - TEST_DAV=$(tests/travis/changed_app.sh dav) - - TC=litmus-v2 - matrix: - - DB=sqlite - -branches: - only: - - master - - /^stable\d+(\.\d+)?$/ - -addons: - apt: - packages: - - realpath - -before_install: - - sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/before_install.sh $DB; fi" - -install: - - sh -c "if [ '$TEST_DAV' = '1' ]; then bash tests/travis/install.sh $DB; fi" - - sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC/install.sh; fi" - - -script: - - sh -c "if [ '$TC' = 'syntax' ]; then composer install && lib/composer/bin/parallel-lint --exclude lib/composer/jakub-onderka/ --exclude 3rdparty/symfony/polyfill-php70/Resources/stubs/ --exclude 3rdparty/patchwork/utf8/src/Patchwork/Utf8/Bootup/ --exclude 3rdparty/paragonie/random_compat/lib/ --exclude lib/composer/composer/autoload_static.php --exclude 3rdparty/composer/autoload_static.php .; fi" - - sh -c "if [ '$TC' = 'app:check-code' ]; then ./occ app:check-code admin_audit; ./occ app:check-code comments; ./occ app:check-code federation; ./occ app:check-code workflowengine; fi" - - sh -c "if [ '$TEST_DAV' != '1' ]; then echo \"Not testing DAV\"; fi" - - sh -c "if [ '$TEST_DAV' = '1' ]; then echo \"Testing DAV\"; fi" - - - sh -c "if [ '$TEST_DAV' = '1' ]; then bash apps/dav/tests/travis/$TC/script.sh; fi" - -matrix: - include: - - php: 5.4 - env: DB=pgsql;TC=litmus-v1 - - php: 5.4 - env: DB=sqlite;TC=carddav - - php: 5.4 - env: DB=sqlite;TC=caldav - - php: 5.4 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - - php: 5.5 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - - php: 5.6 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - - php: 7.0 - env: DB=sqlite;TC=syntax;TEST_DAV=0 - - php: 5.4 - env: DB=sqlite;TC=app:check-code;TEST_DAV=0 - - fast_finish: true diff --git a/apps/dav/tests/travis/litmus-v1/install.sh b/apps/dav/tests/travis/litmus-v1/install.sh deleted file mode 100644 index 0ee2cb08d8..0000000000 --- a/apps/dav/tests/travis/litmus-v1/install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# compile litmus -if [ ! -f /tmp/litmus/litmus-0.13.tar.gz ]; then - mkdir -p /tmp/litmus - wget -O /tmp/litmus/litmus-0.13.tar.gz http://www.webdav.org/neon/litmus/litmus-0.13.tar.gz - cd /tmp/litmus - tar -xzf litmus-0.13.tar.gz - cd /tmp/litmus/litmus-0.13 - ./configure - make -fi diff --git a/apps/dav/tests/travis/litmus-v2/install.sh b/apps/dav/tests/travis/litmus-v2/install.sh deleted file mode 100644 index 0ee2cb08d8..0000000000 --- a/apps/dav/tests/travis/litmus-v2/install.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -# compile litmus -if [ ! -f /tmp/litmus/litmus-0.13.tar.gz ]; then - mkdir -p /tmp/litmus - wget -O /tmp/litmus/litmus-0.13.tar.gz http://www.webdav.org/neon/litmus/litmus-0.13.tar.gz - cd /tmp/litmus - tar -xzf litmus-0.13.tar.gz - cd /tmp/litmus/litmus-0.13 - ./configure - make -fi