From 8f0049a419e044e17634ca00e86f2535139e0d19 Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Thu, 13 Feb 2025 10:27:55 +0000 Subject: [PATCH 1/9] switch to self-hosted --- .github/workflows/ubuntu_22.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ubuntu_22.yml b/.github/workflows/ubuntu_22.yml index 2ab77fff5db28a..3e22a9a0dc72ab 100644 --- a/.github/workflows/ubuntu_22.yml +++ b/.github/workflows/ubuntu_22.yml @@ -395,19 +395,15 @@ jobs: model_scope: 'nightly_hf' container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}", "volumes": ["/mount:/mount"]}' - # TODO: Switch back to self-hosted runners - # container: - # image: openvinogithubactions.azurecr.io/dockerhub/ubuntu:22.04 - # volumes: - # - /mount:/mount PyTorch_Models_Tests: name: PyTorch Models tests if: ${{ github.event_name != 'schedule' && fromJSON(needs.smart_ci.outputs.affected_components).PyTorch_FE.test }} needs: [ Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: - runner: 'ubuntu-22.04-8-cores' + runner: 'aks-linux-8-cores-64gb' model_scope: 'precommit' + container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}", "volumes": ["/mount:/mount"]}' PyTorch_Models_Tests_Nightly_Scope1: name: PyTorch Models Nightly Scope1 tests @@ -415,8 +411,9 @@ jobs: needs: [ Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: - runner: 'ubuntu-22.04-16-cores' + runner: 'aks-linux-16-cores-64gb' model_scope: 'nightly_scope1' + container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}", "volumes": ["/mount:/mount"]}' PyTorch_Models_Tests_Nightly_Scope2: name: PyTorch Models Nightly Scope2 tests @@ -424,8 +421,9 @@ jobs: needs: [ Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: - runner: 'ubuntu-22.04-16-cores' + runner: 'aks-linux-16-cores-64gb' model_scope: 'nightly_scope2' + container: '{"image": "${{ fromJSON(needs.docker.outputs.images).ov_test.ubuntu_22_04_x64 }}", "volumes": ["/mount:/mount"]}' JAX_Models_Tests_Precommit: name: JAX/Flax Models tests From f583c853d9fa6db5c58a9dbdc1c026cd6e8236e9 Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Thu, 13 Feb 2025 12:11:37 +0000 Subject: [PATCH 2/9] add missing needs --- .github/workflows/ubuntu_22.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ubuntu_22.yml b/.github/workflows/ubuntu_22.yml index 3e22a9a0dc72ab..78d3da9d41c7a8 100644 --- a/.github/workflows/ubuntu_22.yml +++ b/.github/workflows/ubuntu_22.yml @@ -398,7 +398,7 @@ jobs: PyTorch_Models_Tests: name: PyTorch Models tests if: ${{ github.event_name != 'schedule' && fromJSON(needs.smart_ci.outputs.affected_components).PyTorch_FE.test }} - needs: [ Build, Smart_CI, Openvino_tokenizers ] + needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: runner: 'aks-linux-8-cores-64gb' @@ -408,7 +408,7 @@ jobs: PyTorch_Models_Tests_Nightly_Scope1: name: PyTorch Models Nightly Scope1 tests if: ${{ github.event_name == 'schedule' }} - needs: [ Build, Smart_CI, Openvino_tokenizers ] + needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: runner: 'aks-linux-16-cores-64gb' @@ -418,7 +418,7 @@ jobs: PyTorch_Models_Tests_Nightly_Scope2: name: PyTorch Models Nightly Scope2 tests if: ${{ github.event_name == 'schedule' }} - needs: [ Build, Smart_CI, Openvino_tokenizers ] + needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: runner: 'aks-linux-16-cores-64gb' From 5cb918ab857c10f8c28271289cd77046ec9a0a9b Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Thu, 13 Feb 2025 14:21:42 +0000 Subject: [PATCH 3/9] add missing dep --- .github/dockerfiles/docker_tag | 2 +- .github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/dockerfiles/docker_tag b/.github/dockerfiles/docker_tag index 37db3d46f34033..ce4f85afe44d28 100644 --- a/.github/dockerfiles/docker_tag +++ b/.github/dockerfiles/docker_tag @@ -1 +1 @@ -pr-28725 +pr-28972 diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile index 56dffb11e7ce12..336f900b4eeb60 100644 --- a/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile +++ b/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile @@ -31,6 +31,10 @@ RUN apt-get update && \ python3.11-distutils \ # For Java API default-jdk \ + # libGL for PyTorch Models tests + ffmpeg \ + libsm6 \ + libxext6 \ && \ rm -rf /var/lib/apt/lists/* From d01bf62671479a236856900a037d20b42e8679e0 Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Fri, 14 Feb 2025 08:36:07 +0000 Subject: [PATCH 4/9] missing dep --- .github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile index 336f900b4eeb60..1a9fa53c92abd1 100644 --- a/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile +++ b/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile @@ -35,6 +35,7 @@ RUN apt-get update && \ ffmpeg \ libsm6 \ libxext6 \ + libgl1 \ && \ rm -rf /var/lib/apt/lists/* From 473f02f85fed1647bc13c94e953c6ed6be45739b Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Fri, 14 Feb 2025 08:36:38 +0000 Subject: [PATCH 5/9] start nightly scope --- .github/workflows/ubuntu_22.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_22.yml b/.github/workflows/ubuntu_22.yml index 78d3da9d41c7a8..c87d36889338a7 100644 --- a/.github/workflows/ubuntu_22.yml +++ b/.github/workflows/ubuntu_22.yml @@ -407,7 +407,7 @@ jobs: PyTorch_Models_Tests_Nightly_Scope1: name: PyTorch Models Nightly Scope1 tests - if: ${{ github.event_name == 'schedule' }} + # if: ${{ github.event_name == 'schedule' }} needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: @@ -417,7 +417,7 @@ jobs: PyTorch_Models_Tests_Nightly_Scope2: name: PyTorch Models Nightly Scope2 tests - if: ${{ github.event_name == 'schedule' }} + # if: ${{ github.event_name == 'schedule' }} needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: From ee42f4996757ec9a13c675a212f8d20359cd088e Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Fri, 14 Feb 2025 10:23:35 +0000 Subject: [PATCH 6/9] another try at deps --- .github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile index 1a9fa53c92abd1..d1df55fd5b9894 100644 --- a/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile +++ b/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile @@ -36,6 +36,8 @@ RUN apt-get update && \ libsm6 \ libxext6 \ libgl1 \ + libgl1-mesa-glx \ + libglib2.0-0 \ && \ rm -rf /var/lib/apt/lists/* From 9cce58d45184fc416669727ab2b8cc71eaa68b81 Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Tue, 18 Feb 2025 10:13:43 +0000 Subject: [PATCH 7/9] move to the test Dockerfile --- .github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile | 7 ------- .github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile b/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile index d1df55fd5b9894..56dffb11e7ce12 100644 --- a/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile +++ b/.github/dockerfiles/ov_build/ubuntu_22_04_x64/Dockerfile @@ -31,13 +31,6 @@ RUN apt-get update && \ python3.11-distutils \ # For Java API default-jdk \ - # libGL for PyTorch Models tests - ffmpeg \ - libsm6 \ - libxext6 \ - libgl1 \ - libgl1-mesa-glx \ - libglib2.0-0 \ && \ rm -rf /var/lib/apt/lists/* diff --git a/.github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile b/.github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile index 2c68ea12d7b58f..e2671de629f39a 100644 --- a/.github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile +++ b/.github/dockerfiles/ov_test/ubuntu_22_04_x64/Dockerfile @@ -32,6 +32,13 @@ RUN apt-get update && \ libhdf5-dev \ # For TF Models tests wget \ + # libGL for PyTorch Models tests + ffmpeg \ + libsm6 \ + libxext6 \ + libgl1 \ + libgl1-mesa-glx \ + libglib2.0-0 \ && \ rm -rf /var/lib/apt/lists/* From 93aaeae55d6fa04ffd07bb3e4f8a7ef02efa456a Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Tue, 18 Feb 2025 12:54:57 +0000 Subject: [PATCH 8/9] do not run nigtly --- .github/workflows/ubuntu_22.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_22.yml b/.github/workflows/ubuntu_22.yml index c87d36889338a7..78d3da9d41c7a8 100644 --- a/.github/workflows/ubuntu_22.yml +++ b/.github/workflows/ubuntu_22.yml @@ -407,7 +407,7 @@ jobs: PyTorch_Models_Tests_Nightly_Scope1: name: PyTorch Models Nightly Scope1 tests - # if: ${{ github.event_name == 'schedule' }} + if: ${{ github.event_name == 'schedule' }} needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: @@ -417,7 +417,7 @@ jobs: PyTorch_Models_Tests_Nightly_Scope2: name: PyTorch Models Nightly Scope2 tests - # if: ${{ github.event_name == 'schedule' }} + if: ${{ github.event_name == 'schedule' }} needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: From 9fa37dc0cb8d03f0588ed10bf8f29b27a987cd0f Mon Sep 17 00:00:00 2001 From: Andrei Kashchikhin Date: Tue, 18 Feb 2025 16:25:01 +0000 Subject: [PATCH 9/9] run nightly --- .github/workflows/ubuntu_22.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu_22.yml b/.github/workflows/ubuntu_22.yml index 78d3da9d41c7a8..c87d36889338a7 100644 --- a/.github/workflows/ubuntu_22.yml +++ b/.github/workflows/ubuntu_22.yml @@ -407,7 +407,7 @@ jobs: PyTorch_Models_Tests_Nightly_Scope1: name: PyTorch Models Nightly Scope1 tests - if: ${{ github.event_name == 'schedule' }} + # if: ${{ github.event_name == 'schedule' }} needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: @@ -417,7 +417,7 @@ jobs: PyTorch_Models_Tests_Nightly_Scope2: name: PyTorch Models Nightly Scope2 tests - if: ${{ github.event_name == 'schedule' }} + # if: ${{ github.event_name == 'schedule' }} needs: [ Docker, Build, Smart_CI, Openvino_tokenizers ] uses: ./.github/workflows/job_pytorch_models_tests.yml with: