diff --git a/.github/workflows/test_baseline.yml b/.github/workflows/test_baseline.yml index 31585760..e797a5d0 100644 --- a/.github/workflows/test_baseline.yml +++ b/.github/workflows/test_baseline.yml @@ -87,7 +87,7 @@ jobs: target: webserver_runtime context: ./docker-app file: ./docker-app/Dockerfile -# push: ${{ github.event_name != 'pull_request' }} + push: ${{ github.event_name != 'pull_request' }} tags: | opengisch/qfieldcloud-app:${{ steps.prepare.outputs.docker_tag }} opengisch/qfieldcloud-app:${{ steps.prepare.outputs.docker_commit }} @@ -100,7 +100,7 @@ jobs: target: worker_wrapper_runtime context: ./docker-app file: ./docker-app/Dockerfile -# push: ${{ github.event_name != 'pull_request' }} + push: ${{ github.event_name != 'pull_request' }} tags: | opengisch/qfieldcloud-worker-wrapper:${{ steps.prepare.outputs.docker_tag }} opengisch/qfieldcloud-worker-wrapper:${{ steps.prepare.outputs.docker_commit }} @@ -121,7 +121,7 @@ jobs: builder: ${{ steps.buildx.outputs.name }} context: ./docker-qgis file: ./docker-qgis/Dockerfile -# push: ${{ github.event_name != 'pull_request' }} + push: ${{ github.event_name != 'pull_request' }} tags: | opengisch/qfieldcloud-qgis:${{ steps.prepare.outputs.docker_tag }} opengisch/qfieldcloud-qgis:${{ steps.prepare.outputs.docker_commit }} @@ -134,7 +134,7 @@ jobs: builder: ${{ steps.buildx.outputs.name }} context: ./docker-nginx file: ./docker-nginx/Dockerfile -# push: ${{ github.event_name != 'pull_request' }} + push: ${{ github.event_name != 'pull_request' }} tags: | opengisch/qfieldcloud-nginx:${{ steps.prepare.outputs.docker_tag }} opengisch/qfieldcloud-nginx:${{ steps.prepare.outputs.docker_commit }} @@ -154,6 +154,12 @@ jobs: # - core # - __flaky__ continue-on-error: true + env: + QFIELDCLOUD_IMAGE_NAME_FOR_APP: "opengisch/qfieldcloud-app-testing:${{ github.sha }}" + QFIELDCLOUD_IMAGE_NAME_FOR_WORKER_WRAPPER: "opengisch/qfieldcloud-worker-wrapper:${{ github.sha }}" + QFIELDCLOUD_IMAGE_NAME_FOR_QGIS: "opengisch/qfieldcloud-qgis:${{ github.sha }}" + QFIELDCLOUD_IMAGE_NAME_FOR_NGINX: "opengisch/qfieldcloud-nginx:${{ github.sha }}" + COMPOSE_FILE: docker-compose.yml:docker-compose.override.services.yml:docker-compose.override.test.yml steps: - name: Checkout repo uses: actions/checkout@v3