Skip to content

Commit 91d2df2

Browse files
authored
Update pre-merge workflow (#4032)
1 parent 886c361 commit 91d2df2

File tree

4 files changed

+30
-20
lines changed

4 files changed

+30
-20
lines changed

.ci/docker/Dockerfile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,9 @@
55
FROM nvidia/cuda:12.1.0-runtime-ubuntu20.04@sha256:c1869c30f46fff478a37ed58d9dace7e08519541274f03424d0b78bd35b2c73a AS python_base_cuda
66
LABEL maintainer="OpenVINO Training Extensions Development Team"
77

8-
ARG HTTP_PROXY
9-
ARG HTTPS_PROXY
10-
ARG NO_PROXY
118
ARG uid
129
ARG gid
1310

14-
# Setup proxies
15-
ENV http_proxy=$HTTP_PROXY
16-
ENV https_proxy=$HTTPS_PROXY
17-
ENV no_proxy=$NO_PROXY
1811
ENV DEBIAN_FRONTEND="noninteractive"
1912

2013
# hadolint ignore=DL3008

.ci/docker/build.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ fi
5353
TAG=$1
5454

5555
docker build -f ./Dockerfile \
56-
--build-arg HTTP_PROXY="${http_proxy:?}" \
57-
--build-arg HTTPS_PROXY="${https_proxy:?}" \
58-
--build-arg NO_PROXY="${no_proxy:?}" \
5956
--build-arg ACTIONS_RUNNER_VER="$ACTIONS_RUNNER_VER" \
6057
--build-arg gid="$(id -g)" \
6158
--build-arg uid="$UID" \

.ci/docker/start-runner.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
GPU_ID="all"
4-
VER_CUDA="11.7.1"
4+
VER_CUDA="12.1.0"
55
TAG_RUNNER="latest"
66
ADDITIONAL_LABELS=""
77
MOUNT_PATH=""
@@ -149,9 +149,6 @@ if [ "$DEBUG_CONTAINER" = true ]; then
149149
--name "$CONTAINER_NAME" \
150150
-e NVIDIA_VISIBLE_DEVICES="$GPU_ID" \
151151
${ENV_FLAGS} \
152-
-e http_proxy=http://proxy-chain.intel.com:911 \
153-
-e https_proxy=http://proxy-chain.intel.com:912 \
154-
-e no_proxy=intel.com,.intel.com,localhost,127.0.0.0/8 \
155152
${MOUNT_FLAGS} \
156153
${CACHE_MOUNT_FLAGS} \
157154
"$DOCKER_REG_ADDR"/ote/ci/cu"$VER_CUDA"/runner:"$TAG_RUNNER"; RET=$?
@@ -172,9 +169,6 @@ else
172169
--name "$CONTAINER_NAME" \
173170
-e NVIDIA_VISIBLE_DEVICES="$GPU_ID" \
174171
${ENV_FLAGS} \
175-
-e http_proxy=http://proxy-chain.intel.com:911 \
176-
-e https_proxy=http://proxy-chain.intel.com:912 \
177-
-e no_proxy=intel.com,.intel.com,localhost,127.0.0.0/8 \
178172
${MOUNT_FLAGS} \
179173
${CACHE_MOUNT_FLAGS} \
180174
"$DOCKER_REG_ADDR"/ote/ci/cu"$VER_CUDA"/runner:"$TAG_RUNNER"; RET=$?

.github/workflows/pre_merge.yaml

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,6 @@ jobs:
103103
- task: "multi_cls_classification"
104104
- task: "multi_label_classification"
105105
- task: "hlabel_classification"
106-
- task: "detection"
107-
- task: "instance_segmentation"
108-
- task: "semantic_segmentation"
109106
- task: "visual_prompting"
110107
- task: "zero_shot_visual_prompting"
111108
- task: "anomaly_classification"
@@ -127,3 +124,32 @@ jobs:
127124
rm /tmp/requirements.txt
128125
- name: Run Integration Test
129126
run: tox -vv -e integration-test-${{ matrix.task }}
127+
Integration-Test-Large:
128+
if: |
129+
github.event.pull_request.draft == false &&
130+
!(startsWith(github.event.pull_request.title, '[WIP]'))
131+
runs-on: [self-hosted, linux, x64, dev, dmount]
132+
needs: Unit-Test
133+
strategy:
134+
fail-fast: false
135+
matrix:
136+
include:
137+
- task: "detection"
138+
- task: "instance_segmentation"
139+
- task: "semantic_segmentation"
140+
name: Integration-Test-Large-${{ matrix.task }}-py310
141+
steps:
142+
- name: Checkout repository
143+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
144+
- name: Install Python
145+
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
146+
with:
147+
python-version: "3.10"
148+
- name: Install tox
149+
run: |
150+
python -m pip install --require-hashes --no-deps -r .ci/requirements.txt
151+
pip-compile --generate-hashes --output-file=/tmp/requirements.txt --extra=ci_tox pyproject.toml
152+
python -m pip install --require-hashes --no-deps -r /tmp/requirements.txt
153+
rm /tmp/requirements.txt
154+
- name: Run Integration Test
155+
run: tox -vv -e integration-test-${{ matrix.task }}

0 commit comments

Comments
 (0)