From 6602455efc2e22a48ceca2b714b17918a6db1362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Calvi=C3=B1o=20S=C3=A1nchez?= Date: Thu, 20 Jul 2017 08:08:35 +0200 Subject: [PATCH] Enable acceptance tests again on Drone 0.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Running the acceptance tests on Drone relied on the pod-style networking used by services (service containers were available at 127.0.0.1 from the build containers). However, in Drone 0.7 service and build containers must be accessed from each other using their domain name instead. Thus, acceptance tests had to be disabled on Drone. Now that the acceptance test system supports setting a different domain for the Selenium server and for the Nextcloud test server the acceptance tests can be enabled again on Drone. Signed-off-by: Daniel Calviño Sánchez --- .drone.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index d0b44b28262..5d385885325 100644 --- a/.drone.yml +++ b/.drone.yml @@ -459,21 +459,21 @@ pipeline: acceptance-access-levels: image: nextcloudci/php7.0:php7.0-7 commands: - - tests/acceptance/run-local.sh --timeout-multiplier 10 allow-git-repository-modifications features/access-levels.feature + - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-access-levels --selenium-server selenium:4444 allow-git-repository-modifications features/access-levels.feature when: matrix: TESTS-ACCEPTANCE: access-levels acceptance-app-files: image: nextcloudci/php7.0:php7.0-7 commands: - - tests/acceptance/run-local.sh --timeout-multiplier 10 allow-git-repository-modifications features/app-files.feature + - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-app-files --selenium-server selenium:4444 allow-git-repository-modifications features/app-files.feature when: matrix: TESTS-ACCEPTANCE: app-files acceptance-login: image: nextcloudci/php7.0:php7.0-7 commands: - - tests/acceptance/run-local.sh --timeout-multiplier 10 allow-git-repository-modifications features/login.feature + - tests/acceptance/run-local.sh --timeout-multiplier 10 --nextcloud-server-domain acceptance-login --selenium-server selenium:4444 allow-git-repository-modifications features/login.feature when: matrix: TESTS-ACCEPTANCE: login @@ -564,12 +564,12 @@ matrix: - TESTS: integration-transfer-ownership-features - TESTS: integration-ldap-features - TESTS: integration-trashbin -# - TESTS: acceptance -# TESTS-ACCEPTANCE: access-levels -# - TESTS: acceptance -# TESTS-ACCEPTANCE: app-files -# - TESTS: acceptance -# TESTS-ACCEPTANCE: login + - TESTS: acceptance + TESTS-ACCEPTANCE: access-levels + - TESTS: acceptance + TESTS-ACCEPTANCE: app-files + - TESTS: acceptance + TESTS-ACCEPTANCE: login - TESTS: jsunit - TESTS: syntax-php5.6 - TESTS: syntax-php7.0