From 8e0c2224710b174435cfd3b3cfb4e2a6bb47d6d5 Mon Sep 17 00:00:00 2001 From: Natalie Schultz <90212258+nataliejschultz@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:55:12 -0600 Subject: [PATCH] Moving (again!!) Realized I put the test key in the wrong service. Moving to see if it could finally work! --- .github/workflows/nominatim-docker-test.yml | 11 +++++------ emission/integrationTests/docker-compose.yml | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nominatim-docker-test.yml b/.github/workflows/nominatim-docker-test.yml index d2b081e9a..ec83ebabd 100644 --- a/.github/workflows/nominatim-docker-test.yml +++ b/.github/workflows/nominatim-docker-test.yml @@ -34,14 +34,13 @@ jobs: - name: Workflow test run: echo Smoke test - # - name: Variable - # run: echo "TEST_KEY=$TEST_KEY" > emission/integrationTests/.env - - # - name: Variable2 - # run: cat emission/integrationTests/.env + - name: Variable + run: echo "TEST_KEY=$TEST_KEY" > emission/integrationTests/.env + - name: Variable2 + run: cat emission/integrationTests/.env - name: Test nominatim - run: TEST_KEY=$TEST_KEY docker-compose -f emission/integrationTests/docker-compose.yml up --exit-code-from web-server + run: docker-compose -f emission/integrationTests/docker-compose.yml up --exit-code-from web-server diff --git a/emission/integrationTests/docker-compose.yml b/emission/integrationTests/docker-compose.yml index e07056da7..bd192c080 100644 --- a/emission/integrationTests/docker-compose.yml +++ b/emission/integrationTests/docker-compose.yml @@ -10,6 +10,7 @@ services: - DB_HOST=db - WEB_SERVER_HOST=0.0.0.0 - NOMINATIM_QUERY_URL=http://rhodeisland-nominatim:8080 + - TEST_KEY=$TEST_KEY 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 @@ -45,7 +46,6 @@ services: - PBF_URL=https://download.geofabrik.de/north-america/us/rhode-island-latest.osm.pbf - REPLICATION_URL=https://download.geofabrik.de/north-america/us/rhode-island-updates/ - IMPORT_WIKIPEDIA=false - - TEST_KEY=$TEST_KEY ports: - "8080:8080" # healthcheck currently commented out, since it isn't necessary and keeps going the entire time the container is running.