Skip to content

Commit

Permalink
ci: remove wait-for-it from api, update test_backend workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
spwoodcock committed Nov 2, 2023
1 parent 373d833 commit 13dc52a
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/build_and_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ on:

jobs:
pytest:
uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@1.1.2
uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@1.2.1
with:
image_name: ghcr.io/${{ github.repository }}/backend
build_context: src/backend
pre_command: docker compose up -d proxy
compose_service: api
compose_command: wait-for-it fmtm-db:5432 --strict -- wait-for-it central:8383 --strict --timeout=30 -- pytest
compose_command: pytest
tag_override: ci-${{ github.ref_name }}
secrets: inherit

Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/pr_test_backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,13 @@ on:

jobs:
pytest:
uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@1.1.2
uses: hotosm/gh-workflows/.github/workflows/test_compose.yml@1.2.1
with:
image_name: ghcr.io/${{ github.repository }}/backend
build_context: src/backend
compose_service: proxy
compose_command: |
wait-for-it fmtm-db:5432 --strict \
-- wait-for-it central:8383 --strict \
--timeout=30 -- pytest
pre_command: docker compose up -d proxy
compose_service: api
compose_command: pytest
cache_extra_imgs: |
"docker.io/postgis/postgis:${{ vars.POSTGIS_TAG }}"
"docker.io/minio/minio:${{ vars.MINIO_TAG }}"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ services:
fmtm-db:
condition: service_healthy
central:
condition: service_started
condition: service_healthy
required: false
migrations:
condition: service_completed_successfully
Expand Down
1 change: 0 additions & 1 deletion src/backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ RUN set -ex \
-y --no-install-recommends \
"nano" \
"curl" \
"wait-for-it" \
"libpcre3" \
"mime-support" \
"postgresql-client" \
Expand Down

0 comments on commit 13dc52a

Please sign in to comment.