From ac37d421b3a218ef1fe0e7f7225d2c44312f946d Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey@cvat.ai>
Date: Tue, 1 Oct 2024 13:27:58 +0300
Subject: [PATCH 1/2] Fixed image tags

---
 .github/workflows/schedule.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
index c2071cd85d1..94e00e4559e 100644
--- a/.github/workflows/schedule.yml
+++ b/.github/workflows/schedule.yml
@@ -127,7 +127,7 @@ jobs:
           context: .
           file: ./Dockerfile.ui
           cache-from: type=local,src=/tmp/cvat_cache_ui
-          tags: cvat/ui:latest
+          tags: cvat/ui:dev
           load: true
 
       - name: CVAT server. Extract metadata (tags, labels) for Docker
@@ -147,9 +147,9 @@ jobs:
       - name: Pull CVAT server image
         run: |
           docker pull ${{ steps.meta-server.outputs.tags }}
+          docker tag ${{ steps.meta-server.outputs.tags }} cvat/server:dev
+          #TODO fix tag in Dockerfile.ci
           docker tag ${{ steps.meta-server.outputs.tags }} cvat/server:local
-          docker tag ${{ steps.meta-server.outputs.tags }} cvat/server:latest
-          docker tag cvat/ui:latest cvat/ui:local
 
       - name: OPA tests
         run: |

From 837dc3ec9b9b5eb51284526f9ba9293d5501f055 Mon Sep 17 00:00:00 2001
From: Andrey Zhavoronkov <andrey@cvat.ai>
Date: Tue, 1 Oct 2024 14:28:57 +0300
Subject: [PATCH 2/2] Split rest and unit tests into different steps

---
 .github/workflows/schedule.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/schedule.yml b/.github/workflows/schedule.yml
index 94e00e4559e..3ed64d0dc73 100644
--- a/.github/workflows/schedule.yml
+++ b/.github/workflows/schedule.yml
@@ -158,15 +158,21 @@ jobs:
           docker compose run --rm -v "$PWD:/mnt/src:ro" -w /mnt/src \
             cvat_opa test cvat/apps/*/rules
 
-      - name: REST API and SDK tests
+      - name: Generate SDK
         run: |
           pip3 install -r cvat-sdk/gen/requirements.txt
           ./cvat-sdk/gen/generate.sh
 
-          pip3 install -r ./tests/python/requirements.txt
-          pip3 install -e ./cvat-sdk
-          pip3 install -e ./cvat-cli
+      - name: Install test dependencies, SDK and CLI
+        run: |
+          pip3 install \
+            -r ./tests/python/requirements.txt \
+            -e './cvat-sdk[pytorch]' \
+            -e ./cvat-cli \
+            --extra-index-url https://download.pytorch.org/whl/cpu
 
+      - name: Run REST API and SDK tests
+        run: |
           pytest tests/python/
           pytest tests/python/ --stop-services
 
@@ -176,7 +182,7 @@ jobs:
           CVAT_ALLOW_STATIC_CACHE="true" pytest tests/python
           pytest tests/python/ --stop-services
 
-      - name: Unit tests
+      - name: Run unit tests
         env:
           HOST_COVERAGE_DATA_DIR: ${{ github.workspace }}
           CONTAINER_COVERAGE_DATA_DIR: "/coverage_data"