From cb19066dc3f7f3af0cf58051dfb13885bfcc0990 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 22 Sep 2016 11:14:15 +0200 Subject: [PATCH 1/2] Move integration tests to single containers This adds improved performance Signed-off-by: Lukas Reschke --- .drone.yml | 169 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 165 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 51e835cc34..08b529a66f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -148,20 +148,180 @@ pipeline: matrix: DB: postgres PHP: 5.6 - integration: + integration-capabilities_features: image: nextcloudci/php7.0:php7.0-2 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration - - ./run.sh + - ./run.sh capabilities_features/capabilities.feature when: matrix: - TESTS: integration + TESTS: integration-capabilities_features + integration-federation_features: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh federation_features/federated.feature + when: + matrix: + TESTS: integration-federation_features + integration-auth: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/auth.feature + when: + matrix: + TESTS: integration-auth + integration-carddav: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/carddav.feature + when: + matrix: + TESTS: integration-carddav + integration-dav-v2: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/dav-v2.feature + when: + matrix: + TESTS: integration-dav-v2 + integration-ocs-v1: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/ocs-v1.feature + when: + matrix: + TESTS: integration-ocs-v1 + integration-sharing-v1: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/sharing-v1.feature + when: + matrix: + TESTS: integration-sharing-v1 + integration-checksums-v1: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/checksums.feature + when: + matrix: + TESTS: integration-checksums + integration-external-storage: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/external-storage.feature + when: + matrix: + TESTS: integration-external-storage + integration-provisioning-v1: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/provisioning-v1.feature + when: + matrix: + TESTS: integration-provisioning-v1 + integration-tags: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/tags.feature + when: + matrix: + TESTS: integration-tags + integration-caldav: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/caldav.feature + when: + matrix: + TESTS: integration-caldav + integration-comments: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/comments.feature + when: + matrix: + TESTS: integration-comments + integration-favorites: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/favorites.feature + when: + matrix: + TESTS: integration-favorites + integration-provisioning-v2: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/provisioning-v2.feature + when: + matrix: + TESTS: integration-provisioning-v2 + integration-webdav-related: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh features/webdav-related.feature + when: + matrix: + TESTS: integration-webdav-related + integration-sharees-features: + image: nextcloudci/php7.0:php7.0-2 + commands: + - ./occ maintenance:install --admin-pass=admin + - cd build/integration + - ./run.sh sharees_features/sharees.feature + when: + matrix: + TESTS: integration-sharees-features matrix: include: - TESTS: signed-off-check - - TESTS: integration + - TESTS: integration-capabilities_features + - TESTS: integration-federation_features + - TESTS: integration-auth + - TESTS: integration-carddav + - TESTS: integration-dav-v2 + - TESTS: integration-ocs-v1 + - TESTS: integration-sharing-v1 + - TESTS: integration-checksums + - TESTS: integration-external-storage + - TESTS: integration-provisioning-v1 + - TESTS: integration-tags + - TESTS: integration-caldav + - TESTS: integration-comments + - TESTS: integration-favorites + - TESTS: integration-provisioning-v2 + - TESTS: integration-webdav-related + - TESTS: integration-sharees-features - TESTS: jsunit - TESTS: check-autoloader - TESTS: app-check-code @@ -209,3 +369,4 @@ services: when: matrix: DB: mysql + From e501fefa90799910c2b8f5e6e03d9f706f5d96ce Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Thu, 22 Sep 2016 12:10:26 +0200 Subject: [PATCH 2/2] Use new integration-php7.0 container This one caches the dependencies Signed-off-by: Lukas Reschke --- .drone.yml | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index 08b529a66f..3e50be209b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -149,7 +149,7 @@ pipeline: DB: postgres PHP: 5.6 integration-capabilities_features: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -158,7 +158,7 @@ pipeline: matrix: TESTS: integration-capabilities_features integration-federation_features: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -167,7 +167,7 @@ pipeline: matrix: TESTS: integration-federation_features integration-auth: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -176,7 +176,7 @@ pipeline: matrix: TESTS: integration-auth integration-carddav: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -185,7 +185,7 @@ pipeline: matrix: TESTS: integration-carddav integration-dav-v2: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -194,7 +194,7 @@ pipeline: matrix: TESTS: integration-dav-v2 integration-ocs-v1: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -203,7 +203,7 @@ pipeline: matrix: TESTS: integration-ocs-v1 integration-sharing-v1: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -212,7 +212,7 @@ pipeline: matrix: TESTS: integration-sharing-v1 integration-checksums-v1: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -221,7 +221,7 @@ pipeline: matrix: TESTS: integration-checksums integration-external-storage: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -230,7 +230,7 @@ pipeline: matrix: TESTS: integration-external-storage integration-provisioning-v1: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -239,7 +239,7 @@ pipeline: matrix: TESTS: integration-provisioning-v1 integration-tags: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -248,7 +248,7 @@ pipeline: matrix: TESTS: integration-tags integration-caldav: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -257,7 +257,7 @@ pipeline: matrix: TESTS: integration-caldav integration-comments: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -266,7 +266,7 @@ pipeline: matrix: TESTS: integration-comments integration-favorites: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -275,7 +275,7 @@ pipeline: matrix: TESTS: integration-favorites integration-provisioning-v2: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -284,7 +284,7 @@ pipeline: matrix: TESTS: integration-provisioning-v2 integration-webdav-related: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration @@ -293,7 +293,7 @@ pipeline: matrix: TESTS: integration-webdav-related integration-sharees-features: - image: nextcloudci/php7.0:php7.0-2 + image: nextcloudci/integration-php7.0:integration-php7.0-1 commands: - ./occ maintenance:install --admin-pass=admin - cd build/integration