ci(pytest): use new format of reusable pytest workflow

hotosm · Oct 22, 2023 · f8cd157 · f8cd157
1 parent 35cdf24
commit f8cd157
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
@@ -19,8 +19,13 @@ jobs:
   pytest:
     uses: hotosm/gh-workflows/.github/workflows/test_pytest_compose.yml@main
     with:
-      image_tag: ci-${{ github.ref_name }}
+      image_name: ghcr.io/${{ github.repository }}/backend
+      build_context: src/backend
+      build_args: |
+        APP_VERSION=${{ github.ref_name }}
+        COMMIT_REF=${{ github.sha }}
       docker_compose_service: api
+      tag_override: ci-${{ github.ref_name }}
     secrets: inherit
 
   frontend-tests:

diff --git a/.github/workflows/pr_test_backend.yml b/.github/workflows/pr_test_backend.yml
@@ -16,8 +16,13 @@ jobs:
   pytest:
     uses: hotosm/gh-workflows/.github/workflows/test_pytest_compose.yml@main
     with:
+      image_name: ghcr.io/${{ github.repository }}/backend
+      build_context: src/backend
+      build_args: |
+        APP_VERSION=${{ github.ref_name }}
+        COMMIT_REF=${{ github.sha }}
       docker_compose_service: api
-      cache_imgs: |
+      cache_extra_imgs: |
         "docker.io/postgis/postgis:${{ vars.POSTGIS_TAG }}"
         "docker.io/minio/minio:${{ vars.MINIO_TAG }}"
       # For caching odk central images, add: