diff --git a/emission/integrationTests/Dockerfile b/emission/integrationTests/Dockerfile index 076b3671e..eb965c631 100644 --- a/emission/integrationTests/Dockerfile +++ b/emission/integrationTests/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get install -y curl RUN echo "About to copy e-mission server code" COPY start_integration_tests.sh/ /start_integration_tests.sh -ENV NOMINATIM_QUERY_URL='nominatim:8080' +ENV NOMINATIM_QUERY_URL='http://rhodeisland-nominatim:8080' # CMD ["python", "../individual_tests/TestNominatim.py"] CMD ["/bin/bash", "/start_integration_tests.sh"] \ No newline at end of file diff --git a/emission/integrationTests/docker-compose.yml b/emission/integrationTests/docker-compose.yml index 7726d6af8..7895d2080 100644 --- a/emission/integrationTests/docker-compose.yml +++ b/emission/integrationTests/docker-compose.yml @@ -1,18 +1,15 @@ -version: "3" +# version: "3" services: web-server: build: context: . depends_on: - db - - nominatim + - nominatim: + condition: service_healthy environment: - DB_HOST=db - WEB_SERVER_HOST=0.0.0.0 - ports: - - "8181:8181" - links: - - nominatim:rhodeisland-nominatim volumes: # specify the host directory where the source code should live # If this is ~/e-mission-server-docker, then you can edit the files at @@ -21,7 +18,7 @@ services: - ../..:/src/e-mission-server networks: - emission - - nominatim-network + - nominatim db: image: mongo:4.4.0 ports: @@ -49,7 +46,6 @@ services: - IMPORT_WIKIPEDIA=false ports: - "8080:8080" - deploy: replicas: 1 restart_policy: @@ -57,14 +53,11 @@ services: volumes: - nominatim-data:/var/lib/postgresql/14/main networks: - - nominatim-network + - nominatim networks: emission: - name: emission - nominatim-network: - name: nominatim-network - driver: bridge + nominatim: volumes: mongo-data: diff --git a/emission/integrationTests/start_integration_tests.sh b/emission/integrationTests/start_integration_tests.sh index 46ed03d88..6cf2bd8a4 100644 --- a/emission/integrationTests/start_integration_tests.sh +++ b/emission/integrationTests/start_integration_tests.sh @@ -16,20 +16,16 @@ else fi cat conf/storage/db.conf -echo "Python path before setting up conda: $PYTHONPATH" echo "Setting up conda..." source setup/setup_conda.sh Linux-x86_64 -echo "Python path after setup_conda: $PYTHONPATH" echo "Setting up the test environment..." source setup/setup_tests.sh -echo "Python path after setup_tests: $PYTHONPATH" echo "Running tests..." source setup/activate_tests.sh -echo "Python path after activate_tests: $PYTHONPATH" chmod +x runIntegrationTests.sh # tail -f /dev/null