Skip to content

Commit

Permalink
Docker images update to include svg rendering libs for Python (#93)
Browse files Browse the repository at this point in the history
* Docker images update to include svg rendering libs for Python.

* Test python based tools as dedicated entity.
  • Loading branch information
asmorkalov committed Apr 25, 2023
1 parent dd412f2 commit d91a776
Show file tree
Hide file tree
Showing 18 changed files with 98 additions and 34 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/OCV-Contrib-PR-3.4-U20.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
Expand Down Expand Up @@ -417,12 +417,20 @@ jobs:
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
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 }}
- name: Python3
- name: Python3 Bindings
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
run: |
cd $HOME/build
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
- name: Python3 Apps
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
run: |
cd $HOME/build
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
fi
- name: Java
timeout-minutes: 60
id: java-test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/OCV-Contrib-PR-4.x-U20-Cuda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
options: --gpus all -m 8G
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/OCV-Contrib-PR-4.x-U20.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
Expand Down Expand Up @@ -425,12 +425,20 @@ jobs:
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
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 }}
- name: Python3
- name: Python3 Bindings
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
run: |
cd $HOME/build
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
- name: Python3 Apps
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
run: |
cd $HOME/build
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
fi
- name: Java
timeout-minutes: 60
id: java-test
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
Expand Down Expand Up @@ -419,12 +419,20 @@ jobs:
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
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 }}
- name: Python3
- name: Python3 Bingings
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
run: |
cd $HOME/build
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
- name: Python3 Apps
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
run: |
cd $HOME/build
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
fi
- name: Java
timeout-minutes: 60
id: java-test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/OCV-Contrib-PR-5.x-U20-Cuda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
options: --gpus all -m 8G
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
Expand Down
12 changes: 10 additions & 2 deletions .github/workflows/OCV-Contrib-PR-5.x-U20.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv_contrib:/home/ci/.ccache
Expand Down Expand Up @@ -427,12 +427,20 @@ jobs:
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
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 }}
- name: Python3
- name: Python3 Bingings
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
run: |
cd $HOME/build
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
- name: Python3 Apps
timeout-minutes: 60
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
run: |
cd $HOME/build
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
fi
- name: Java
timeout-minutes: 60
id: java-test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/OCV-PR-3.4-ARM64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down Expand Up @@ -255,7 +255,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/OCV-PR-3.4-U20.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down Expand Up @@ -260,7 +260,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/OCV-PR-4.x-ARM64-Debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down Expand Up @@ -182,7 +182,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/OCV-PR-4.x-ARM64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down Expand Up @@ -219,12 +219,20 @@ jobs:
timeout-minutes: 60
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_videoio --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
- name: Python3
- name: Python3 Bindings
timeout-minutes: 60
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
run: |
cd $HOME/build
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
- name: Python3 Apps
timeout-minutes: 60
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
run: |
cd $HOME/build
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
fi
- name: Java
timeout-minutes: 60
id: java-test
Expand All @@ -244,7 +252,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/OCV-PR-4.x-U20-Cuda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
options: --gpus all -m 8G
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/OCV-PR-4.x-U20.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down Expand Up @@ -228,12 +228,20 @@ jobs:
timeout-minutes: 60
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_videoio --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
- name: Python3
- name: Python3 Bindings
timeout-minutes: 60
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
run: |
cd $HOME/build
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
- name: Python3 Apps
timeout-minutes: 60
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
run: |
cd $HOME/build
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
fi
- name: Java
timeout-minutes: 60
id: java-test
Expand All @@ -257,7 +265,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230410
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/OCV-PR-5.x-ARM64-Debug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down Expand Up @@ -190,7 +190,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down
14 changes: 11 additions & 3 deletions .github/workflows/OCV-PR-5.x-ARM64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down Expand Up @@ -235,12 +235,20 @@ jobs:
timeout-minutes: 60
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
run: cd $HOME/build && xvfb-run -a bin/opencv_perf_videoio --perf_impl=plain --perf_min_samples=1 --perf_force_samples=1 --perf_verify_sanity --skip_unstable=1 --perf_threads=${{ env.PARALLEL_JOBS }}
- name: Python3
- name: Python3 Bindings
timeout-minutes: 60
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
run: |
cd $HOME/build
python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
- name: Python3 Apps
timeout-minutes: 60
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
run: |
cd $HOME/build
if [ -f "$HOME/opencv/apps/python_app_test.py" ]; then
python3 "$HOME/opencv/apps/python_app_test.py" --repo $HOME/opencv -v
fi
- name: Java
timeout-minutes: 60
id: java-test
Expand All @@ -260,7 +268,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04-arm64:20230413
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
- /home/opencv-cn/ci_cache/opencv:/home/ci/.ccache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/OCV-PR-5.x-U20-Cuda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run:
shell: bash
container:
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20220901
image: quay.io/opencv-ci/opencv-ubuntu-20.04:20230413
options: --gpus all -m 8G
volumes:
- /home/opencv-cn/git_cache:/home/ci/git_cache
Expand Down
Loading

0 comments on commit d91a776

Please sign in to comment.