From a7b28dea065c6a4ec121e2794c75b2e163b476e8 Mon Sep 17 00:00:00 2001 From: Dzhoshkun Ismail Shakir Date: Sun, 21 Oct 2018 13:02:59 +0100 Subject: [PATCH] Issue #24, #26: replaced test-giftgrab-epiphan-* calls with calls to test launcher script in CI config --- .gitlab-ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2364c3b..2db4b2f9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -245,7 +245,8 @@ pypi-epiphan-dvi2pcie-duo: # Epiphan DVI2PCIe Duo support (OpenCV only) - pip install -vvv --install-option="--hevc" --install-option="--nvenc" --install-option="--enable-nonfree" --install-option="--xvid" --install-option="--vp9" --install-option="--epiphan-dvi2pcie-duo" --install-option="--no-i420" --upgrade "$PyPI_INSTALLER" # Disabled the BGRA tests of Epiphan DVI2PCIe Duo (currently using OpenCV) until issue #115 is resolved - # - test-giftgrab-epiphan-dvi2pcieduo-bgra; exit_on_fail + # - $TEST_LAUNCHER epiphan-dvi2pcie bgra sdi; exit_on_fail + # - $TEST_LAUNCHER epiphan-dvi2pcie bgra dvi; exit_on_fail # - edd-dvi-bgra-hevc; exit_on_fail # - edd-sdi-bgra-hevc; exit_on_fail # - edd-dvi-bgra-xvid; exit_on_fail @@ -255,7 +256,8 @@ pypi-epiphan-dvi2pcie-duo: # Epiphan DVI2PCIe Duo support (Epiphan SDK only) - pip install -vvv --install-option="--hevc" --install-option="--nvenc" --install-option="--enable-nonfree" --install-option="--vp9" --install-option="--epiphan-dvi2pcie-duo" --install-option="--epiphansdk" --install-option="--no-bgra" --upgrade "$PyPI_INSTALLER" # TODO: issue #102 - # - test-giftgrab-epiphan-dvi2pcieduo-i420; exit_on_fail + # - $TEST_LAUNCHER epiphan-dvi2pcie i420 sdi; exit_on_fail + # - $TEST_LAUNCHER epiphan-dvi2pcie i420 dvi; exit_on_fail # Disabled the BGRA tests of Epiphan DVI2PCIe Duo (currently using OpenCV) until issue #115 is resolved - edd-dvi-i420-hevc; exit_on_fail - edd-sdi-i420-hevc; exit_on_fail @@ -270,7 +272,8 @@ pypi-epiphan-dvi2pcie-duo: # see definition of width_offset in test_epiphan_py_module.py (Epiphan DVI2PCIe Duo tests) - export USE_EPIPHANSDK=3 - pip install -vvv --install-option="--hevc" --install-option="--nvenc" --install-option="--enable-nonfree" --install-option="--xvid" --install-option="--vp9" --install-option="--epiphan-dvi2pcie-duo" --install-option="--epiphansdk" --upgrade "$PyPI_INSTALLER" - - test-giftgrab-epiphan-dvi2pcieduo-i420; exit_on_fail + - $TEST_LAUNCHER epiphan-dvi2pcie i420 sdi; exit_on_fail + - $TEST_LAUNCHER epiphan-dvi2pcie i420 dvi; exit_on_fail - edd-dvi-i420-hevc; exit_on_fail - edd-sdi-i420-hevc; exit_on_fail - edd-dvi-i420-vp9; exit_on_fail @@ -280,7 +283,8 @@ pypi-epiphan-dvi2pcie-duo: - rm -f ./*.mp4 ./*.avi ./*.webm # NumPy support - pip install -vvv --install-option="--hevc" --install-option="--nvenc" --install-option="--enable-nonfree" --install-option="--xvid" --install-option="--vp9" --install-option="--epiphan-dvi2pcie-duo" --install-option="--epiphansdk" --install-option="--numpy" --upgrade "$PyPI_INSTALLER" - - test-giftgrab-epiphan-dvi2pcieduo-i420; exit_on_fail + - $TEST_LAUNCHER epiphan-dvi2pcie i420 sdi; exit_on_fail + - $TEST_LAUNCHER epiphan-dvi2pcie i420 dvi; exit_on_fail - edd-dvi-i420-hevc; exit_on_fail - edd-sdi-i420-hevc; exit_on_fail - edd-dvi-i420-vp9; exit_on_fail