mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7022 from nextcloud/acceptance-tests-7.1 

bump acceptance test suite to use php 7.1 image
This commit is contained in:
blizzz 2017-10-31 16:35:38 +01:00 committed by GitHub
parent b3ff9a2248 5a7ed332de
commit 22ef95ca69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -136,3 +136,7 @@ Vagrantfile
/config/config-autotest-backup.php /config/config-autotest-backup.php
/config/autoconfig.php /config/autoconfig.php
clover.xml clover.xml
# Tests - dependencies
tests/acceptance/composer.lock
tests/acceptance/vendor/

2
tests/acceptance/run.sh
View File

@ -138,7 +138,7 @@ function prepareDocker() {
# Selenium server. # Selenium server.
# The container exits immediately if no command is given, so a Bash session # The container exits immediately if no command is given, so a Bash session
# is created to prevent that. # is created to prevent that.
docker run --detach --name=$NEXTCLOUD_LOCAL_CONTAINER --network=container:$SELENIUM_CONTAINER --interactive --tty nextcloudci/php7.0:php7.0-7 bash docker run --detach --name=$NEXTCLOUD_LOCAL_CONTAINER --network=container:$SELENIUM_CONTAINER --interactive --tty nextcloudci/php7.1:php7.1-15 bash
# Use the $TMPDIR or, if not set, fall back to /tmp. # Use the $TMPDIR or, if not set, fall back to /tmp.
NEXTCLOUD_LOCAL_TAR="$($MKTEMP --tmpdir="${TMPDIR:-/tmp}" --suffix=.tar nextcloud-local-XXXXXXXXXX)" NEXTCLOUD_LOCAL_TAR="$($MKTEMP --tmpdir="${TMPDIR:-/tmp}" --suffix=.tar nextcloud-local-XXXXXXXXXX)"