Merge branch 'post-merge-update-2' into 'main' (acb451a5) · Commits · IVAS Codec Public Collaboration / IVAS Codec CI

includes/default-variables.yml

+1 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,4 @@ variables:
		TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400
		BASOP_REFERENCE_BRANCH: "ivas-float-update"
		SCALE_FACTOR: "3.162"
		BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch"

includes/rules.yml

+0 −16

Original line number	Diff line number	Diff line
		@@ -35,14 +35,6 @@
		- if: $CI_PIPELINE_SOURCE == 'push'
		when: never

		.rules-merge-request-to-basop-ci-branch-pc:
		extends: .rules-basis
		rules:
		- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "basop-ci-branch-pc"
		- if: $CI_PIPELINE_SOURCE == 'push'
		when: never


		.rules-merge-request-to-basop-ci-branch-or-main:
		extends: .rules-basis
		rules:
		@@ -50,14 +42,6 @@
		- if: $CI_PIPELINE_SOURCE == 'push'
		when: never

		.rules-merge-request-to-basop-ci-branch-pc-or-main:
		extends: .rules-basis
		rules:
		- if: $CI_PIPELINE_SOURCE == 'merge_request_event' && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "basop-ci-branch-pc" \|\| $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main")
		- if: $CI_PIPELINE_SOURCE == 'push'
		when: never


		.rules-main-push:
		extends: .rules-basis
		rules:

main-basop.yml

+10 −10

Original line number	Diff line number	Diff line
		@@ -251,7 +251,7 @@ workflow:
		- testcase_timeout=$TESTCASE_TIMEOUT_STV
		- fi

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- if [ $LEVEL_SCALING != "1.0" ]; then
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh
		- fi
		@@ -387,7 +387,7 @@ workflow:
		- testcase_timeout=$TESTCASE_TIMEOUT_STV
		- fi

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- python3 scripts/prepare_combined_format_inputs.py

		- if [ $LEVEL_SCALING != "1.0" ];then
		@@ -517,7 +517,7 @@ workflow:
		- testcase_timeout=$TESTCASE_TIMEOUT_STV
		- fi

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- if [ $LEVEL_SCALING != "1.0" ];then
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh
		- fi
		@@ -658,7 +658,7 @@ workflow:
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES

		- set -euxo pipefail
		- make_args="CLANG=$CLANG_NUM"
		@@ -706,7 +706,7 @@ workflow:
		- testcase_timeout=$TESTCASE_TIMEOUT_STV
		- fi

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES
		- if [ $LEVEL_SCALING != "1.0" ];then
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/apply-testv-scaling.sh
		- fi
		@@ -795,7 +795,7 @@ fail-pipeline-if-in-draft:
		- echo "Your MR is still in Draft state, set it to ready to be mergable, then retrigger the pipeline."
		- exit 1

		# this branch runs on merges to main-pc only and will fail if the branch itself does not conform to the naming conventions
		# TODO: decide how to handle this after merge back to main
		.check-naming-of-branch-for-basop-update-merges:
		extends:
		- .rules-merge-request-to-main
		@@ -1275,7 +1275,7 @@ ivas-pytest-on-merge-request:
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
		- source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-merge-target-binaries.sh
		- source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/merge-request-comparison-setup-codec.sh
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES

		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
		# write to temporary file as workaround for failures observed with piping echo
		@@ -1492,7 +1492,7 @@ ivas-interop-on-merge-request:
		- source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-merge-target-binaries.sh
		- source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/merge-request-comparison-setup-codec.sh

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES

		# some helper variables - "\|\| true" to prevent failures from grep not finding anything
		# write to temporary file as workaround for failures observed with piping echo
		@@ -1723,7 +1723,7 @@ renderer-usan:
		- testcase_timeout=$SELFTEST_SANITY_TIMEOUT
		- export UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1

		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES

		- exit_code20=0
		- exit_code10=0
		@@ -2316,7 +2316,7 @@ check-be-between-renderer-framesizes:
		- echo "$SHORT_TEST_SUITE"

		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/build-float-ref-and-dut-binaries.sh
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES --use-main-pc-set
		- python3 ci/remove_unsupported_testcases.py $PRM_FILES

		- exit_code=0
		- python3 -m pytest tests/codec_be_on_mr_nonselection --tb=no -v --ref_encoder_path ./IVAS_cod_ref --ref_decoder_path ./IVAS_dec --update_ref 1 --html=report-20ms.html --self-contained-html --junit-xml=report-junit-20ms.xml \|\| exit_code=$?