diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-29 13:56:56 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-29 13:56:56 +0200 |
| commit | e3a98e4959c36432b1e8250afc03708e10a32cca (patch) | |
| tree | 352ae2a01152ac107321a2bc6b85525cdff302f9 /build | |
| parent | 2d1f509acf6bab68d4b1f092a0f4b8fc8da5e125 (diff) | |
| download | nextcloud-server-e3a98e4959c36432b1e8250afc03708e10a32cca.tar.gz nextcloud-server-e3a98e4959c36432b1e8250afc03708e10a32cca.zip | |
Support different server ports - defined by EXECUTOR_NUMBER
Diffstat (limited to 'build')
| -rw-r--r-- | build/integration/config/behat.yml | 4 | ||||
| -rw-r--r-- | build/integration/features/bootstrap/FeatureContext.php | 6 | ||||
| -rwxr-xr-x | build/integration/run.sh | 12 |
3 files changed, 14 insertions, 8 deletions
diff --git a/build/integration/config/behat.yml b/build/integration/config/behat.yml index 78a228a5c1e..01ca0d18790 100644 --- a/build/integration/config/behat.yml +++ b/build/integration/config/behat.yml @@ -12,6 +12,6 @@ default: ci: formatter: - name: junit + name: pretty,junit parameters: - output_path: ./output + output_path: null,./output diff --git a/build/integration/features/bootstrap/FeatureContext.php b/build/integration/features/bootstrap/FeatureContext.php index 527e0c9ba08..b7a04e1ca76 100644 --- a/build/integration/features/bootstrap/FeatureContext.php +++ b/build/integration/features/bootstrap/FeatureContext.php @@ -34,6 +34,12 @@ class FeatureContext extends BehatContext { // Initialize your context here $this->baseUrl = $parameters['baseUrl']; $this->adminUser = $parameters['admin']; + + // in case of ci deployment we take the server url from the environment + $testServerUrl = getenv('TEST_SERVER_URL'); + if ($testServerUrl !== false) { + $this->baseUrl = $testServerUrl; + } } /** diff --git a/build/integration/run.sh b/build/integration/run.sh index df33d85fc74..08f10b86c5f 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -3,17 +3,17 @@ composer install # TODO: avoid port collision on jenkins - use $EXECUTOR_NUMBER -#if [ -z "$EXECUTOR_NUMBER" ]; then -# EXECUTOR_NUMBER=0 -#fi -#PORT=$((8080 + $EXECUTOR_NUMBER)) -PORT=8080 +if [ -z "$EXECUTOR_NUMBER" ]; then + EXECUTOR_NUMBER=0 +fi +PORT=$((8080 + $EXECUTOR_NUMBER)) +#PORT=8080 echo $PORT php -S localhost:$PORT -t ../.. & PHPPID=$! echo $PHPPID -#export BEHAT_PARAMS="context[parameters][base_url]=http://localhost:$PORT/ocs" +export TEST_SERVER_URL="http://localhost:$PORT/ocs/" vendor/bin/behat --profile ci kill $PHPPID |