Merge branch 'fix-integration-tests'

Author: quapka

.dockerignore

@@ -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

integration-tests/Dockerfile.test_client

@@ -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 \

integration-tests/compose.yaml

@@ -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

run_integration_tests.sh

@@ -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 \
@@ -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 \