Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>tags/v29.0.0beta1
@@ -23,8 +23,8 @@ fi | |||
echo "Docker executable found - setup docker" | |||
echo "Fetch recent morrisjobke/webdav docker image" | |||
docker pull morrisjobke/webdav | |||
echo "Fetch recent webdav docker image" | |||
docker pull ghcr.io/nextcloud/continuous-integration-webdav-apache:latest | |||
# retrieve current folder to place the config in the parent folder | |||
thisFolder=`echo $0 | sed 's#env/start-webdav-apache\.sh##'` | |||
@@ -45,7 +45,7 @@ if [ -n "$RUN_DOCKER_MYSQL" ]; then | |||
parameter="--link $containerName:db" | |||
fi | |||
container=`docker run -P $parameter -d -e USERNAME=test -e PASSWORD=test morrisjobke/webdav` | |||
container=`docker run -P $parameter -d --rm ghcr.io/nextcloud/continuous-integration-webdav-apache:latest` | |||
host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container` | |||
echo -n "Waiting for Apache initialization on ${host}:${port}" | |||
@@ -64,7 +64,7 @@ return array( | |||
'run'=>true, | |||
'host'=>'${host}:80/webdav/', | |||
'user'=>'test', | |||
'password'=>'test', | |||
'password'=>'pass', | |||
'root'=>'', | |||
// wait delay in seconds after write operations | |||
// (only in tests) |
@@ -31,16 +31,21 @@ function print_syntax { | |||
} | |||
if ! [ -x "$PHPUNIT" ]; then | |||
echo "phpunit executable not found, please install phpunit version >= 4.8" >&2 | |||
exit 3 | |||
echo "phpunit executable not found, trying local one from build/integration" >&2 | |||
if [ -x "$PWD/build/integration/vendor/phpunit/phpunit/phpunit" ]; then | |||
PHPUNIT="$PWD/build/integration/vendor/phpunit/phpunit/phpunit" | |||
else | |||
echo "phpunit executable not found, please install phpunit version >= 9.6" >&2 | |||
exit 3 | |||
fi | |||
fi | |||
PHPUNIT_VERSION=$("$PHPUNIT" --version | cut -d" " -f2) | |||
PHPUNIT_MAJOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f1) | |||
PHPUNIT_MINOR_VERSION=$(echo $PHPUNIT_VERSION | cut -d"." -f2) | |||
if ! [ $PHPUNIT_MAJOR_VERSION -gt 9 -o \( $PHPUNIT_MAJOR_VERSION -eq 9 -a $PHPUNIT_MINOR_VERSION -ge 0 \) ]; then | |||
echo "phpunit version >= 9.0 required. Version found: $PHPUNIT_VERSION" >&2 | |||
if ! [ $PHPUNIT_MAJOR_VERSION -gt 9 -o \( $PHPUNIT_MAJOR_VERSION -eq 9 -a $PHPUNIT_MINOR_VERSION -ge 6 \) ]; then | |||
echo "phpunit version >= 9.6 required. Version found: $PHPUNIT_VERSION" >&2 | |||
exit 4 | |||
fi | |||