From 490eba9207fd2f810f4f28249096261bdb93a1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Fri, 8 Aug 2025 14:41:52 +0200 Subject: [PATCH 1/3] Run pytest MR scripts in parallel --- .gitlab-ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a3a9e4706a..b3e7a0cdac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -773,6 +773,12 @@ ivas-pytest-on-merge-request: stage: compare needs: ["build-codec-linux-cmake", "codec-smoke-test"] timeout: "14 minutes" + parallel: + matrix: + # note: keep in sync with list in tests/codec_be_on_mr_selection + - PYTEST_SCRIPT: + - test_param_file.py + - test_sba.py script: - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh - commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)" @@ -790,7 +796,7 @@ ivas-pytest-on-merge-request: ### prepare pytest # create references - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1 + - python3 -m pytest "$TESTS_DIR_CODEC_BE_ON_MR"/"$PYTEST_SCRIPT" -v --update_ref 1 ### Run test using branch scripts and input - if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi -- GitLab From 50405a0a65e955a9a5e4c26341f8d3b296aa9b77 Mon Sep 17 00:00:00 2001 From: Tapani Pihlajakuja Date: Mon, 11 Aug 2025 10:19:37 +0300 Subject: [PATCH 2/3] Add specific pytest also to the second pytest command --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3e7a0cdac..b6d72d02fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -804,7 +804,7 @@ ivas-pytest-on-merge-request: ### run pytest - exit_code=0 - testcase_timeout=60 - - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout || exit_code=$? + - python3 -m pytest "$TESTS_DIR_CODEC_BE_ON_MR"/"$PYTEST_SCRIPT" -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout || exit_code=$? - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true - *merge-request-comparison-check -- GitLab From 1a8c901a5be7a702a5b3fced5f322c29eacd9f4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=BCller?= Date: Mon, 11 Aug 2025 12:52:56 +0200 Subject: [PATCH 3/3] Improve comment --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6d72d02fc..4543351734 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -775,7 +775,7 @@ ivas-pytest-on-merge-request: timeout: "14 minutes" parallel: matrix: - # note: keep in sync with list in tests/codec_be_on_mr_selection + # note: keep in sync with list in $TESTS_DIR_CODEC_BE_ON_MR - PYTEST_SCRIPT: - test_param_file.py - test_sba.py -- GitLab