diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0adca53a588ceb23d1df547fd0dbf028752183a..3ff188fbcb454f9fdd6d43e30082eb5beb719a03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,5 +30,5 @@ test: - git clone --depth=1 https://gitlab-ci-token:${CI_JOB_TOKEN}@git.autistici.org/ai3/testdata.git /tmp/testdata.$CI_JOB_ID - xzcat /tmp/testdata.$CI_JOB_ID/noblogs/noblogs.sql.xz | mysql --user=root --password=rootpass --host=mysql noblogs - for blog in cavallette detriti docs ; do xzcat /tmp/testdata.$CI_JOB_ID/noblogs/noblogs_${blog}.sql.xz | mysql --user=root --password=rootpass --host=mysql noblogs; done - - with-container --expose=8080:8080 --mount=type=bind,source=docker/test-config.json,destination=/etc/noblogs/config.json --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/blogs.dir --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/cache $IMAGE_TAG ./docker/test.sh + - with-container --expose=8080 --mount=type=bind,source=docker/test-config.json,destination=/etc/noblogs/config.json --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/blogs.dir --mount=type=tmpfs,destination=/opt/noblogs/www/wp-content/cache $IMAGE_TAG ./docker/test.sh diff --git a/docker/test.sh b/docker/test.sh index dc62403569f0f15dda6b3f054a8d11ee8ac0f2e8..9201c786158a7834e4b0de40d66feca72e194534 100755 --- a/docker/test.sh +++ b/docker/test.sh @@ -3,7 +3,7 @@ TESTSUITE_IMAGE="registry.git.autistici.org/noblogs/testsuite:main" # Run a ssl-reverse-proxy in the background. -podman run -d --expose 8443:8443 --rm --env PROXY_DOMAIN=noblogs.org --env PROXY_BACKEND_ADDR=localhost:8080 --network=host registry.git.autistici.org/pipelines/images/test/ssl-reverse-proxy:main +podman run -d --expose 8443 --rm --env PROXY_DOMAIN=noblogs.org --env PROXY_BACKEND_ADDR=localhost:8080 --network=host registry.git.autistici.org/pipelines/images/test/ssl-reverse-proxy:main # Run the test suite using Podman, in the foreground. podman run --rm --pull=always --env TARGET_URL=${TARGET_URL} --env TARGET_ADDR=${TARGET_ADDR} --network=host ${TESTSUITE_IMAGE}