diff --git a/.github/workflows/OCV-PR-4.x-U20-OpenVINO.yaml b/.github/workflows/OCV-PR-4.x-U20-OpenVINO.yaml index 279c9a83..b1c366f7 100644 --- a/.github/workflows/OCV-PR-4.x-U20-OpenVINO.yaml +++ b/.github/workflows/OCV-PR-4.x-U20-OpenVINO.yaml @@ -1,4 +1,4 @@ -name: OCV PR:4.x U20 OpenVINO +name: OCV PR:4.x U24 OpenVINO on: pull_request: @@ -33,7 +33,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-openvino:20230724 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-openvino:20260622 volumes: - /home/opencv-cn/git_cache:/home/openvino/git_cache - /home/opencv-cn/ci_cache/opencv:/home/openvino/.ccache @@ -43,9 +43,6 @@ jobs: - name: Brief system information timeout-minutes: 60 run: bash ${{ env.GIT_CACHE_DOCKER }}/print_system_information.sh - - name: Define proper HOME path - timeout-minutes: 60 - run: echo "HOME=/home/openvino" >> $GITHUB_ENV - name: Setup infra environment timeout-minutes: 60 if: ${{ github.event.repository.name == 'ci-gha-workflow' }} diff --git a/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml b/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml index e8e139d7..4314d0b9 100644 --- a/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml +++ b/.github/workflows/OCV-PR-5.x-U20-OpenVINO.yaml @@ -1,4 +1,4 @@ -name: OCV PR:5.x U20 OpenVINO +name: OCV PR:5.x U24 OpenVINO on: pull_request: @@ -33,7 +33,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-20.04-openvino:20230724 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-openvino:20260622 volumes: - /home/opencv-cn/git_cache:/home/openvino/git_cache - /home/opencv-cn/ci_cache/opencv:/home/openvino/.ccache @@ -43,9 +43,6 @@ jobs: - name: Brief system information timeout-minutes: 60 run: bash ${{ env.GIT_CACHE_DOCKER }}/print_system_information.sh - - name: Define proper HOME path - timeout-minutes: 60 - run: echo "HOME=/home/openvino" >> $GITHUB_ENV - name: Setup infra environment timeout-minutes: 60 if: ${{ github.event.repository.name == 'ci-gha-workflow' }} diff --git a/docker/ubuntu/Dockerfile-openvino b/docker/ubuntu/Dockerfile-openvino index dabce24a..663f2060 100644 --- a/docker/ubuntu/Dockerfile-openvino +++ b/docker/ubuntu/Dockerfile-openvino @@ -1,7 +1,7 @@ -# Version: 20230724 -# Image name: quay.io/opencv-ci/opencv-ubuntu-20.04-openvino +# Version: 20260622 +# Image name: quay.io/opencv-ci/opencv-ubuntu-24.04-openvino -FROM openvino/ubuntu20_dev:2024.0.0 +FROM openvino/ubuntu24_dev:2026.2.1 USER root @@ -36,15 +36,14 @@ RUN \ libavcodec-dev \ libavformat-dev \ libswscale-dev \ - libavresample-dev \ + libavdevice-dev \ hdf5-tools \ libhdf5-dev \ liblept5 \ libgoogle-glog-dev \ - libatlas-base-dev \ - libeigen3-dev \ libsuitesparse-dev \ liblapacke-dev \ + libopenblas-dev \ libeigen3-dev \ xvfb \ pkg-config \