Update pre-merge workflow (#4032)

openvinotoolkit · Oct 15, 2024 · 91d2df2 · 91d2df2
1 parent 886c361
commit 91d2df2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/.ci/docker/Dockerfile b/.ci/docker/Dockerfile
@@ -5,16 +5,9 @@
 FROM nvidia/cuda:12.1.0-runtime-ubuntu20.04@sha256:c1869c30f46fff478a37ed58d9dace7e08519541274f03424d0b78bd35b2c73a AS python_base_cuda
 LABEL maintainer="OpenVINO Training Extensions Development Team"
 
-ARG HTTP_PROXY
-ARG HTTPS_PROXY
-ARG NO_PROXY
 ARG uid
 ARG gid
 
-# Setup proxies
-ENV http_proxy=$HTTP_PROXY
-ENV https_proxy=$HTTPS_PROXY
-ENV no_proxy=$NO_PROXY
 ENV DEBIAN_FRONTEND="noninteractive"
 
 # hadolint ignore=DL3008

diff --git a/.ci/docker/build.sh b/.ci/docker/build.sh
@@ -53,9 +53,6 @@ fi
 TAG=$1
 
 docker build -f ./Dockerfile \
---build-arg HTTP_PROXY="${http_proxy:?}" \
---build-arg HTTPS_PROXY="${https_proxy:?}" \
---build-arg NO_PROXY="${no_proxy:?}" \
 --build-arg ACTIONS_RUNNER_VER="$ACTIONS_RUNNER_VER" \
 --build-arg gid="$(id -g)" \
 --build-arg uid="$UID" \

diff --git a/.ci/docker/start-runner.sh b/.ci/docker/start-runner.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 GPU_ID="all"
-VER_CUDA="11.7.1"
+VER_CUDA="12.1.0"
 TAG_RUNNER="latest"
 ADDITIONAL_LABELS=""
 MOUNT_PATH=""
@@ -149,9 +149,6 @@ if [ "$DEBUG_CONTAINER" = true ]; then
         --name "$CONTAINER_NAME" \
         -e NVIDIA_VISIBLE_DEVICES="$GPU_ID" \
         ${ENV_FLAGS} \
-        -e http_proxy=http://proxy-chain.intel.com:911 \
-        -e https_proxy=http://proxy-chain.intel.com:912 \
-        -e no_proxy=intel.com,.intel.com,localhost,127.0.0.0/8 \
         ${MOUNT_FLAGS} \
         ${CACHE_MOUNT_FLAGS} \
         "$DOCKER_REG_ADDR"/ote/ci/cu"$VER_CUDA"/runner:"$TAG_RUNNER"; RET=$?
@@ -172,9 +169,6 @@ else
         --name "$CONTAINER_NAME" \
         -e NVIDIA_VISIBLE_DEVICES="$GPU_ID" \
         ${ENV_FLAGS} \
-        -e http_proxy=http://proxy-chain.intel.com:911 \
-        -e https_proxy=http://proxy-chain.intel.com:912 \
-        -e no_proxy=intel.com,.intel.com,localhost,127.0.0.0/8 \
         ${MOUNT_FLAGS} \
         ${CACHE_MOUNT_FLAGS} \
         "$DOCKER_REG_ADDR"/ote/ci/cu"$VER_CUDA"/runner:"$TAG_RUNNER"; RET=$?

diff --git a/.github/workflows/pre_merge.yaml b/.github/workflows/pre_merge.yaml
@@ -103,9 +103,6 @@ jobs:
           - task: "multi_cls_classification"
           - task: "multi_label_classification"
           - task: "hlabel_classification"
-          - task: "detection"
-          - task: "instance_segmentation"
-          - task: "semantic_segmentation"
           - task: "visual_prompting"
           - task: "zero_shot_visual_prompting"
           - task: "anomaly_classification"
@@ -127,3 +124,32 @@ jobs:
           rm /tmp/requirements.txt
       - name: Run Integration Test
         run: tox -vv -e integration-test-${{ matrix.task }}
+  Integration-Test-Large:
+    if: |
+      github.event.pull_request.draft == false &&
+      !(startsWith(github.event.pull_request.title, '[WIP]'))
+    runs-on: [self-hosted, linux, x64, dev, dmount]
+    needs: Unit-Test
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - task: "detection"
+          - task: "instance_segmentation"
+          - task: "semantic_segmentation"
+    name: Integration-Test-Large-${{ matrix.task }}-py310
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - name: Install Python
+        uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
+        with:
+          python-version: "3.10"
+      - name: Install tox
+        run: |
+          python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
+          pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
+          python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
+          rm /tmp/requirements.txt
+      - name: Run Integration Test
+        run: tox -vv -e integration-test-${{ matrix.task }}