From 6522d7befdacee07decc951580892d5e343b5e8e Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Mon, 18 May 2026 10:30:09 +0300 Subject: [PATCH 1/2] Added pyyml and pillow for python tests as reference implementation. --- .github/workflows/OCV-PR-Linux-NoHAL.yaml | 2 +- .github/workflows/OCV-PR-Linux.yaml | 6 +++--- docker/ubuntu/Dockerfile-20 | 4 ++-- docker/ubuntu/Dockerfile-22 | 4 ++-- docker/ubuntu/Dockerfile-24 | 6 ++++-- docker/ubuntu/Dockerfile-26 | 6 ++++-- 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/OCV-PR-Linux-NoHAL.yaml b/.github/workflows/OCV-PR-Linux-NoHAL.yaml index 35b49b44..aa39255f 100644 --- a/.github/workflows/OCV-PR-Linux-NoHAL.yaml +++ b/.github/workflows/OCV-PR-Linux-NoHAL.yaml @@ -52,7 +52,7 @@ jobs: run: shell: bash container: - image: 'quay.io/opencv-ci/opencv-ubuntu-24.04:20251127' + image: 'quay.io/opencv-ci/opencv-ubuntu-24.04:20260515' volumes: - /home/opencv-cn/git_cache:/opt/git_cache - /home/opencv-cn/ci_cache/opencv/24.04:/opt/.ccache diff --git a/.github/workflows/OCV-PR-Linux.yaml b/.github/workflows/OCV-PR-Linux.yaml index afba9ec7..97ddb93b 100644 --- a/.github/workflows/OCV-PR-Linux.yaml +++ b/.github/workflows/OCV-PR-Linux.yaml @@ -68,7 +68,7 @@ jobs: gphoto2: true aravis: true - version: '24.04' - image: '24.04:20251127' + image: '24.04:20260515' jpegxl: true avif: true avx2: true @@ -81,11 +81,11 @@ jobs: # jpegxl: true # avif: true - version: '22.04' - image: '22.04:20251015' + image: '22.04:20260515' avif: true plugins: true - version: '20.04' - image: '20.04:20251015' + image: '20.04:20260515' limited_api: true defaults: run: diff --git a/docker/ubuntu/Dockerfile-20 b/docker/ubuntu/Dockerfile-20 index bfc2c1c6..326bc6e2 100644 --- a/docker/ubuntu/Dockerfile-20 +++ b/docker/ubuntu/Dockerfile-20 @@ -1,4 +1,4 @@ -# Version: 20251015 +# Version: 20260515 # Image name: quay.io/opencv-ci/opencv-ubuntu-20.04 FROM ubuntu:20.04 @@ -69,7 +69,7 @@ RUN \ pkg-config \ && \ apt-get clean && python3 -m pip install --upgrade pip && \ - pip install requests pylint==2.4.4 cairosvg && pip cache purge + pip install requests pylint==2.4.4 cairosvg pyyaml pillow && pip cache purge RUN \ apt-get update && \ diff --git a/docker/ubuntu/Dockerfile-22 b/docker/ubuntu/Dockerfile-22 index ee590df2..3b815e8a 100644 --- a/docker/ubuntu/Dockerfile-22 +++ b/docker/ubuntu/Dockerfile-22 @@ -1,4 +1,4 @@ -# Version: 20251015 +# Version: 20260515 # Image name: quay.io/opencv-ci/opencv-ubuntu-22.04 FROM ubuntu:22.04 @@ -63,7 +63,7 @@ RUN \ pkg-config \ && \ apt-get clean && python3 -m pip install --upgrade pip && \ - pip install requests pylint==2.4.4 cairosvg && pip cache purge + pip install requests pylint==2.4.4 cairosvg pyyaml pillow && pip cache purge RUN \ apt-get update && \ diff --git a/docker/ubuntu/Dockerfile-24 b/docker/ubuntu/Dockerfile-24 index 8b42bf98..1c98c2a7 100644 --- a/docker/ubuntu/Dockerfile-24 +++ b/docker/ubuntu/Dockerfile-24 @@ -1,4 +1,4 @@ -# Version: 20251127 +# Version: 20260515 # Image name: quay.io/opencv-ci/opencv-ubuntu-24.04 FROM ubuntu:24.04 @@ -78,7 +78,9 @@ RUN python3 -m pip install --break-system-packages \ numpy \ pylint \ requests \ - cairosvg && \ + cairosvg \ + pyyaml \ + pillow && \ pip cache purge # Self-hosted runner UID is 1000 diff --git a/docker/ubuntu/Dockerfile-26 b/docker/ubuntu/Dockerfile-26 index df764b3a..c25ef9d4 100644 --- a/docker/ubuntu/Dockerfile-26 +++ b/docker/ubuntu/Dockerfile-26 @@ -1,4 +1,4 @@ -# Version: 20260425 +# Version: 20260515 # Image name: quay.io/opencv-ci/opencv-ubuntu-26.04 FROM ubuntu:26.04 @@ -78,7 +78,9 @@ RUN python3 -m pip install --break-system-packages \ numpy \ pylint \ requests \ - cairosvg && \ + cairosvg \ + pyyaml \ + pillow && \ pip cache purge # Self-hosted runner UID is 1000 From 08e22025a64a064b35fc471f461f28a55d039fa4 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 19 May 2026 09:15:14 +0300 Subject: [PATCH 2/2] Updated ARM dockers. --- .github/workflows/OCV-PR-4.x-ARM64-Debug.yaml | 4 ++-- .github/workflows/OCV-PR-4.x-ARM64.yaml | 4 ++-- .github/workflows/OCV-PR-5.x-ARM64-Debug.yaml | 4 ++-- .github/workflows/OCV-PR-5.x-ARM64.yaml | 4 ++-- docker/ubuntu/Dockerfile-arm64-24 | 6 ++++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml b/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml index 27dcc862..6706f153 100644 --- a/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml +++ b/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml @@ -34,7 +34,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20260515 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -206,7 +206,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20260515 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-4.x-ARM64.yaml b/.github/workflows/OCV-PR-4.x-ARM64.yaml index 69ed27c7..18faedbe 100644 --- a/.github/workflows/OCV-PR-4.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-4.x-ARM64.yaml @@ -35,7 +35,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20260515 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -254,7 +254,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20260515 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml b/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml index 109012b2..a3f3a7a4 100644 --- a/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml +++ b/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml @@ -32,7 +32,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20260515 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -208,7 +208,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20260515 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/.github/workflows/OCV-PR-5.x-ARM64.yaml b/.github/workflows/OCV-PR-5.x-ARM64.yaml index 78efe611..34f59434 100644 --- a/.github/workflows/OCV-PR-5.x-ARM64.yaml +++ b/.github/workflows/OCV-PR-5.x-ARM64.yaml @@ -35,7 +35,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20260515 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache @@ -270,7 +270,7 @@ jobs: run: shell: bash container: - image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20251201 + image: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64:20260515 volumes: - /home/opencv-cn/git_cache:/home/ci/git_cache - /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache diff --git a/docker/ubuntu/Dockerfile-arm64-24 b/docker/ubuntu/Dockerfile-arm64-24 index 7ed09006..e0e458ac 100644 --- a/docker/ubuntu/Dockerfile-arm64-24 +++ b/docker/ubuntu/Dockerfile-arm64-24 @@ -1,4 +1,4 @@ -# Version: 20251201 +# Version: 20260515 # Image name: quay.io/opencv-ci/opencv-ubuntu-24.04-arm64 FROM ubuntu:24.04 @@ -79,7 +79,9 @@ RUN python3 -m pip install --break-system-packages \ numpy \ pylint \ requests \ - cairosvg && \ + cairosvg \ + pyyaml \ + pillow && \ pip cache purge # Self-hosted runner UID is 1004