From 860b0d96a6d767d6b3e499180dcaf82944af6694 Mon Sep 17 00:00:00 2001 From: Kirill Sizov Date: Sat, 10 Sep 2022 04:17:54 +0300 Subject: [PATCH] Update workflow configs (#4930) --- .github/workflows/full.yml | 15 ++++++++++----- .github/workflows/main.yml | 5 +++++ .github/workflows/schedule.yml | 8 ++++---- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/full.yml b/.github/workflows/full.yml index db39ae18..31c1528c 100644 --- a/.github/workflows/full.yml +++ b/.github/workflows/full.yml @@ -69,7 +69,7 @@ jobs: mkdir /tmp/cvat_server mkdir /tmp/cvat_ui - - name: CVAT server. Build and push + - name: CVAT server. Build uses: docker/build-push-action@v3 with: cache-from: type=local,src=/tmp/cvat_cache_server @@ -78,7 +78,7 @@ jobs: tags: cvat/server outputs: type=docker,dest=/tmp/cvat_server/image.tar - - name: CVAT UI. Build and push + - name: CVAT UI. Build uses: docker/build-push-action@v3 with: cache-from: type=local,src=/tmp/cvat_cache_ui @@ -162,6 +162,8 @@ jobs: run: | docker load --input /tmp/cvat_server/image.tar docker load --input /tmp/cvat_ui/image.tar + docker tag cvat/server:latest cvat/server:dev + docker tag cvat/ui:latest cvat/server:dev docker image ls -a - name: Running REST API and SDK tests @@ -217,6 +219,7 @@ jobs: - name: Load Docker images run: | docker load --input /tmp/cvat_server/image.tar + docker tag cvat/server:latest cvat/server:dev docker image ls -a - name: Running OPA tests @@ -252,11 +255,9 @@ jobs: - name: Uploading "cvat" container logs as an artifact if: failure() uses: actions/upload-artifact@v2 - env: - LOGS_DIR: "${{ github.workspace }}/unit_testing" with: name: container_logs - path: $LOGS_DIR + path: "${{ github.workspace }}/unit_testing" e2e_testing: needs: build @@ -296,6 +297,8 @@ jobs: run: | docker load --input /tmp/cvat_server/image.tar docker load --input /tmp/cvat_ui/image.tar + docker tag cvat/server:latest cvat/server:dev + docker tag cvat/ui:latest cvat/ui:dev docker image ls -a - name: Run CVAT instance @@ -336,11 +339,13 @@ jobs: npx cypress run \ --headed \ --browser chrome \ + --env coverage=false --config-file cypress_canvas3d.json \ --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js' else npx cypress run \ --browser chrome \ + --env coverage=false --spec 'cypress/integration/${{ matrix.specs }}/**/*.js,cypress/integration/remove_users_tasks_projects_organizations.js' fi diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ffb1d993..f85b3a7b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -129,6 +129,8 @@ jobs: run: | docker load --input /tmp/cvat_server/image.tar docker load --input /tmp/cvat_ui/image.tar + docker tag cvat/server:latest cvat/server:dev + docker tag cvat/ui:latest cvat/ui:dev docker image ls -a - name: Running REST API tests @@ -181,6 +183,7 @@ jobs: - name: Load Docker server image run: | docker load --input /tmp/cvat_server/image.tar + docker tag cvat/server:latest cvat/server:dev docker image ls -a - name: Running OPA tests @@ -256,6 +259,8 @@ jobs: run: | docker load --input /tmp/cvat_server/image.tar docker load --input /tmp/cvat_ui/image.tar + docker tag cvat/server:latest cvat/server:dev + docker tag cvat/ui:latest cvat/ui:dev docker image ls -a - name: Run CVAT instance diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml index 7177ba51..a435aa05 100644 --- a/.github/workflows/schedule.yml +++ b/.github/workflows/schedule.yml @@ -214,7 +214,7 @@ jobs: - name: Pull CVAT server image run: | docker pull ${{ steps.meta-server.outputs.tags }} - docker tag ${{ steps.meta-server.outputs.tags }} cvat/server + docker tag ${{ steps.meta-server.outputs.tags }} cvat/server:dev - name: OPA tests run: | @@ -308,10 +308,10 @@ jobs: - name: Pull CVAT UI image run: | docker pull ${{ steps.meta-server.outputs.tags }} - docker tag ${{ steps.meta-server.outputs.tags }} cvat/server + docker tag ${{ steps.meta-server.outputs.tags }} cvat/server:dev docker pull ${{ steps.meta-ui.outputs.tags }} - docker tag ${{ steps.meta-ui.outputs.tags }} cvat/ui + docker tag ${{ steps.meta-ui.outputs.tags }} cvat/ui:dev - name: Run CVAT instance run: | @@ -430,7 +430,7 @@ jobs: - name: Pull CVAT server image run: | docker pull ${{ steps.meta-server.outputs.tags }} - docker tag ${{ steps.meta-server.outputs.tags }} cvat/server + docker tag ${{ steps.meta-server.outputs.tags }} cvat/server:dev - name: Downloading coverage results uses: actions/download-artifact@v2