diff options
| author | Louis <6653109+artonge@users.noreply.github.com> | 2021-10-06 21:04:47 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-06 21:04:47 +0200 |
| commit | 9a569ff387f0f74af4b5423c1c1180a1d01fa7bd (patch) | |
| tree | f1705f76ccc311ea0ef92c98d0f51c7ea7f38a4e | |
| parent | 978b9a0614ac1b1647728178eecf39e14caa9228 (diff) | |
| parent | b13ce08ac8392b76ceaf736bb3f3d393e8f71b6c (diff) | |
| download | nextcloud-server-9a569ff387f0f74af4b5423c1c1180a1d01fa7bd.tar.gz nextcloud-server-9a569ff387f0f74af4b5423c1c1180a1d01fa7bd.zip | |
Merge pull request #29064 from nextcloud/feature/add_cache_to_local_integration_tests_container
Add caching for local run of integration and acceptance tests
| -rwxr-xr-x | build/integration/run-docker.sh | 4 | ||||
| -rwxr-xr-x | tests/acceptance/run.sh | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/build/integration/run-docker.sh b/build/integration/run-docker.sh index 7f8408d2126..308749fd810 100755 --- a/build/integration/run-docker.sh +++ b/build/integration/run-docker.sh @@ -140,7 +140,9 @@ function prepareDocker() { echo "Starting the Nextcloud container" # When using "nextcloudci/phpX.Y" images the container exits immediately if # no command is given, so a Bash session is created to prevent that. - docker run --detach --name=$NEXTCLOUD_LOCAL_CONTAINER $NEXTCLOUD_LOCAL_CONTAINER_NETWORK_OPTIONS --interactive --tty $NEXTCLOUD_LOCAL_IMAGE bash + docker run \ + --volume composer_cache:/root/.composer \ + --detach --name=$NEXTCLOUD_LOCAL_CONTAINER $NEXTCLOUD_LOCAL_CONTAINER_NETWORK_OPTIONS --interactive --tty $NEXTCLOUD_LOCAL_IMAGE bash # Use the $TMPDIR or, if not set, fall back to /tmp. NEXTCLOUD_LOCAL_TAR="$($MKTEMP --tmpdir="${TMPDIR:-/tmp}" --suffix=.tar nextcloud-local-XXXXXXXXXX)" diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh index 9a77d717a0c..07f3f3cce51 100755 --- a/tests/acceptance/run.sh +++ b/tests/acceptance/run.sh @@ -138,7 +138,13 @@ function prepareDocker() { # Selenium server. # The container exits immediately if no command is given, so a Bash session # is created to prevent that. - docker run --detach --name=$NEXTCLOUD_LOCAL_CONTAINER --network=container:$SELENIUM_CONTAINER --interactive --tty nextcloudci/acceptance-php7.3:acceptance-php7.3-2 bash + docker run \ + --detach \ + --name=$NEXTCLOUD_LOCAL_CONTAINER \ + --network=container:$SELENIUM_CONTAINER \ + --volume composer_cache:/root/.composer \ + --interactive \ + --tty nextcloudci/acceptance-php7.3:acceptance-php7.3-2 bash # Use the $TMPDIR or, if not set, fall back to /tmp. NEXTCLOUD_LOCAL_TAR="$($MKTEMP --tmpdir="${TMPDIR:-/tmp}" --suffix=.tar nextcloud-local-XXXXXXXXXX)" |