Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,10 @@ Dockerfile*
./keys
./integration-tests/.env

# Ignore the compose file themselves
compose.base.yaml
compose.deploy.yaml
./integration-tests/compose.yaml

# Ignore integration tests completely
./integration-tests
4 changes: 2 additions & 2 deletions integration-tests/Dockerfile.test_client
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ RUN chown --recursive test-client:test-group /app

USER test-client

ARG MEESIGN_TEST_CLIENT_REPO_OWNER=quapka
ARG MEESIGN_TEST_CLIENT_REPO_BRANCH=integration-test
ARG MEESIGN_TEST_CLIENT_REPO_OWNER=crocs-muni
ARG MEESIGN_TEST_CLIENT_REPO_BRANCH=devel
RUN git clone \
--recurse-submodules \
--depth 1 \
Expand Down
7 changes: 4 additions & 3 deletions integration-tests/compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@ services:
test-client:
build:
args:
# By deafult test against `main` branch
MEESIGN_TEST_CLIENT_REPO_OWNER: quapka
MEESIGN_TEST_CLIENT_REPO_BRANCH: integration-test
# TODO Test against crocs-muni `main` branch
# TODO Allow testing against a particular commit or a tag
MEESIGN_TEST_CLIENT_REPO_OWNER: crocs-muni
MEESIGN_TEST_CLIENT_REPO_BRANCH: devel
dockerfile: ./integration-tests/Dockerfile.test_client
networks:
# This network is defined in the /docker-compose.dev.yaml
Expand Down
5 changes: 0 additions & 5 deletions run_integration_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ if test "$1" == "down"; then
fi

if [ -z "$1" ]; then
# Call all tests by default
MEESIGN_TEST_CLIENT_REPO_OWNER=quapka \
MEESIGN_TEST_CLIENT_REPO_BRANCH=integration-test \
docker compose \
--file compose.base.yaml \
--file integration-tests/compose.yaml \
Expand All @@ -28,8 +25,6 @@ if [ -z "$1" ]; then
else
# If any command line arguments are supplied, these are pass on to the
# `test-client`, i.e. calling `dart test --reporter=expanded "$@"`
MEESIGN_TEST_CLIENT_REPO_OWNER=quapka \
MEESIGN_TEST_CLIENT_REPO_BRANCH=integration-test \
docker compose \
--file compose.base.yaml \
--file integration-tests/compose.yaml \
Expand Down
Loading