Skip to content

Commit d91a776

Browse files
asmorkalovasmorkalov
authored
Docker images update to include svg rendering libs for Python (#93)
* Docker images update to include svg rendering libs for Python. * Test python based tools as dedicated entity.
1 parent dd412f2 commit d91a776

18 files changed

+98
-34
lines changed

‎.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run:
3535
shell: bash
3636
container:
37-
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
37+
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
3838
volumes:
3939
- /home/opencv-cn/git_cache:/home/ci/git_cache
4040
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache

‎.github/workflows/OCV-Contrib-PR-3.4-U20.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run:
3535
shell: bash
3636
container:
37-
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
37+
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
3838
volumes:
3939
- /home/opencv-cn/git_cache:/home/ci/git_cache
4040
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache

‎.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run:
3535
shell: bash
3636
container:
37-
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
37+
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
3838
volumes:
3939
- /home/opencv-cn/git_cache:/home/ci/git_cache
4040
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
@@ -417,12 +417,20 @@ jobs:
417417
timeout-minutes: 60
418418
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
419419
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xphoto --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=${{ env.PARALLEL_JOBS }}
420-
- name: Python3
420+
- name: Python3 Bindings
421421
timeout-minutes: 60
422422
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
423423
run: |
424424
cd $HOME/build
425425
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
426+
- name: Python3 Apps
427+
timeout-minutes: 60
428+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
429+
run: |
430+
cd $HOME/build
431+
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
432+
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
433+
fi
426434
- name: Java
427435
timeout-minutes: 60
428436
id: java-test

‎.github/workflows/OCV-Contrib-PR-4.x-U20-Cuda.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run:
3232
shell: bash
3333
container:
34-
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
34+
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
3535
options: --gpus all -m 8G
3636
volumes:
3737
- /home/opencv-cn/git_cache:/home/ci/git_cache

‎.github/workflows/OCV-Contrib-PR-4.x-U20.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run:
3535
shell: bash
3636
container:
37-
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410
37+
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
3838
volumes:
3939
- /home/opencv-cn/git_cache:/home/ci/git_cache
4040
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
@@ -425,12 +425,20 @@ jobs:
425425
timeout-minutes: 60
426426
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
427427
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xphoto --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=${{ env.PARALLEL_JOBS }}
428-
- name: Python3
428+
- name: Python3 Bindings
429429
timeout-minutes: 60
430430
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
431431
run: |
432432
cd $HOME/build
433433
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
434+
- name: Python3 Apps
435+
timeout-minutes: 60
436+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
437+
run: |
438+
cd $HOME/build
439+
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
440+
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
441+
fi
434442
- name: Java
435443
timeout-minutes: 60
436444
id: java-test

‎.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run:
3535
shell: bash
3636
container:
37-
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
37+
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
3838
volumes:
3939
- /home/opencv-cn/git_cache:/home/ci/git_cache
4040
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
@@ -419,12 +419,20 @@ jobs:
419419
timeout-minutes: 60
420420
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
421421
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xstereo --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --gtest_filter=${{ env.GTEST_FILTER_STRING }} --perf_threads=${{ env.PARALLEL_JOBS }}
422-
- name: Python3
422+
- name: Python3 Bingings
423423
timeout-minutes: 60
424424
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
425425
run: |
426426
cd $HOME/build
427427
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
428+
- name: Python3 Apps
429+
timeout-minutes: 60
430+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
431+
run: |
432+
cd $HOME/build
433+
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
434+
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
435+
fi
428436
- name: Java
429437
timeout-minutes: 60
430438
id: java-test

‎.github/workflows/OCV-Contrib-PR-5.x-U20-Cuda.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run:
3232
shell: bash
3333
container:
34-
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
34+
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
3535
options: --gpus all -m 8G
3636
volumes:
3737
- /home/opencv-cn/git_cache:/home/ci/git_cache

‎.github/workflows/OCV-Contrib-PR-5.x-U20.yaml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
run:
3535
shell: bash
3636
container:
37-
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410
37+
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
3838
volumes:
3939
- /home/opencv-cn/git_cache:/home/ci/git_cache
4040
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
@@ -427,12 +427,20 @@ jobs:
427427
timeout-minutes: 60
428428
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
429429
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_xstereo --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
430-
- name: Python3
430+
- name: Python3 Bingings
431431
timeout-minutes: 60
432432
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
433433
run: |
434434
cd $HOME/build
435435
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
436+
- name: Python3 Apps
437+
timeout-minutes: 60
438+
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
439+
run: |
440+
cd $HOME/build
441+
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
442+
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
443+
fi
436444
- name: Java
437445
timeout-minutes: 60
438446
id: java-test

‎.github/workflows/OCV-PR-3.4-ARM64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run:
3434
shell: bash
3535
container:
36-
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
36+
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
3737
volumes:
3838
- /home/opencv-cn/git_cache:/home/ci/git_cache
3939
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
@@ -255,7 +255,7 @@ jobs:
255255
run:
256256
shell: bash
257257
container:
258-
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
258+
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
259259
volumes:
260260
- /home/opencv-cn/git_cache:/home/ci/git_cache
261261
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache

‎.github/workflows/OCV-PR-3.4-U20.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
run:
3434
shell: bash
3535
container:
36-
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
36+
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
3737
volumes:
3838
- /home/opencv-cn/git_cache:/home/ci/git_cache
3939
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
@@ -260,7 +260,7 @@ jobs:
260260
run:
261261
shell: bash
262262
container:
263-
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
263+
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
264264
volumes:
265265
- /home/opencv-cn/git_cache:/home/ci/git_cache
266266
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache

0 commit comments

Comments
 (0)