Merge branch 'main' into renderer-short-for-ltv-tests (1fecc9d1) · Commits · IVAS Codec Public Collaboration / IVAS Codec CI

includes/default-variables-basop.yml

+1 −1

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ variables:
		CUT_COMMIT_FILE: "CuT-git-sha.txt"
		MERGE_TARGET_COMMIT_FILE: "merge-target-git-sha.txt"
		MERGE_SOURCE_FLOAT_REF_COMMIT_FILE: "merge-source-float-ref-git-sha.txt"
		RUNNER_TAG: "ivas-basop-linux"
		RUNNER_TAG: "ivas-linux"
		LOGS_BACKUP_SOURCE_DIR: ""
		LOGS_BACKUP_TARGET_DIR: ""
		# set this to true to skip the external HRTF testcases in pytest calls

main-basop.yml

+25 −25

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ workflow:
		# override for centrally defined job to make use of the basop runners
		.job-linux:
		tags:
		- ivas-basop-linux
		- ivas-linux

		# custom variant of this template, we need to update the scripts repo before every build
		.test-job-linux:
		@@ -802,7 +802,7 @@ uninterruptible:
		- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
		when: always
		tags:
		- ivas-basop-linux
		- ivas-linux

		# ---------------------------------------------------------------
		# verification jobs
		@@ -817,7 +817,7 @@ fail-pipeline-if-in-draft:
		when: never
		stage: postvalidate
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- echo "Your MR is still in Draft state, set it to ready to be mergable, then retrigger the pipeline."
		- exit 1
		@@ -828,7 +828,7 @@ check-float-ref-companion-branch-exists-for-porting-merge-requests:
		- .job-linux
		stage: prevalidate
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		# we need to source the script here so that the correct exit code is returned from the global job shell and the "allow_failure" recognizes it
		- source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/check-float-ref-companion-branch-exists-for-porting-merge-requests.sh
		@@ -848,7 +848,7 @@ branch-is-up-to-date-with-target-pre:
		stage: prevalidate
		needs: []
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
		- source "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/branch-is-up-to-date-with-target-pre.sh
		@@ -866,7 +866,7 @@ branch-is-up-to-date-with-target-post:
		- .rules-merge-request-no-draft
		stage: postvalidate
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- \|
		commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)"
		@@ -1071,7 +1071,7 @@ build-codec-windows-msbuild:
		- .build-job-windows
		timeout: "10 minutes"
		tags:
		- ivas-basop-windows
		- ivas-windows
		script:
		- *print-common-info-windows
		- *activate-WX-windows
		@@ -1259,7 +1259,7 @@ renderer-pytest-on-merge-request:
		- .rules-merge-request-no-draft
		timeout: "90 minutes"
		tags:
		- ivas-basop-linux
		- ivas-linux
		stage: compare
		variables:
		REPORT_XML: "report--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.xml"
		@@ -1337,7 +1337,7 @@ ivas-pytest-on-merge-request:
		REPORT_HTML: "report--ivas_pytest_on_merge_request-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.html"
		REPORT_CSV: "report--ivas_pytest_on_merge_request-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- 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
		@@ -1402,7 +1402,7 @@ split-rendering-pytest-on-merge-request:
		- .test-job-linux-compares-to-fixed-target
		- .rules-merge-request-no-draft
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		timeout: "60 minutes"
		stage: compare
		variables:
		@@ -1710,7 +1710,7 @@ renderer-msan:
		needs: ["build-codec-linux-cmake"]
		stage: test
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- 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
		@@ -1739,7 +1739,7 @@ renderer-usan:
		needs: ["build-codec-linux-cmake"]
		stage: test
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- 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
		@@ -1845,7 +1845,7 @@ codec-msan:
		extends:
		- .sanitizer-selftest-on-mr
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- CLANG_NUM=1
		- SELFTEST_SANITY_TIMEOUT=180
		@@ -1858,7 +1858,7 @@ codec-asan:
		extends:
		- .sanitizer-selftest-on-mr
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- CLANG_NUM=2
		- SELFTEST_SANITY_TIMEOUT=180
		@@ -1871,7 +1871,7 @@ codec-usan:
		extends:
		- .sanitizer-selftest-on-mr
		tags:
		- ivas-basop-linux
		- ivas-linux
		script:
		- CLANG_NUM=3
		- SELFTEST_SANITY_TIMEOUT=180
		@@ -2038,7 +2038,7 @@ ivas-pytest-compare_ref-long-dec:
		- .rules-pytest-long
		- .test-job-linux
		tags:
		- ivas-basop-linux
		- ivas-linux
		- high-memory-capacity
		before_script:
		- USE_LTV=1
		@@ -2065,7 +2065,7 @@ ivas-pytest-compare_ref-long-dec-lev-10:
		- .rules-pytest-long
		- .test-job-linux
		tags:
		- ivas-basop-linux
		- ivas-linux
		- high-memory-capacity
		before_script:
		- USE_LTV=1
		@@ -2092,7 +2092,7 @@ ivas-pytest-compare_ref-long-dec-lev+10:
		- .rules-pytest-long
		- .test-job-linux
		tags:
		- ivas-basop-linux
		- ivas-linux
		- high-memory-capacity
		before_script:
		- USE_LTV=1
		@@ -2107,7 +2107,7 @@ ivas-pytest-compare_ref-long-fx-fx:
		- .rules-pytest-long-fx-fx
		- .test-job-linux
		tags:
		- ivas-basop-linux
		- ivas-linux
		before_script:
		- USE_LTV=1
		- REF_ENCODER_PATH=./$DUT_ENCODER_PATH
		@@ -2121,7 +2121,7 @@ ivas-pytest-compare_ref-long-fx-fx-lev-10:
		- .rules-pytest-long-fx-fx
		- .test-job-linux
		tags:
		- ivas-basop-linux
		- ivas-linux
		before_script:
		- USE_LTV=1
		- REF_ENCODER_PATH=./$DUT_ENCODER_PATH
		@@ -2135,7 +2135,7 @@ ivas-pytest-compare_ref-long-fx-fx-lev+10:
		- .rules-pytest-long-fx-fx
		- .test-job-linux
		tags:
		- ivas-basop-linux
		- ivas-linux
		before_script:
		- USE_LTV=1
		- REF_ENCODER_PATH=./$DUT_ENCODER_PATH
		@@ -2150,7 +2150,7 @@ ivas-pytest-msan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		resource_group: basop-long-sanitizers
		rules:
		- if: $CI_PIPELINE_SOURCE == 'push'
		@@ -2169,7 +2169,7 @@ ivas-pytest-asan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		resource_group: basop-long-sanitizers
		rules:
		- if: $CI_PIPELINE_SOURCE == 'push'
		@@ -2188,7 +2188,7 @@ ivas-pytest-usan:
		extends:
		- .test-job-linux
		tags:
		- ivas-basop-linux-fast
		- ivas-linux-fast
		resource_group: basop-long-sanitizers
		rules:
		- if: $CI_PIPELINE_SOURCE == 'push'
		@@ -2747,7 +2747,7 @@ ivas-conformance-linux:
		pages:
		stage: deploy
		tags:
		- ivas-basop-linux
		- ivas-linux
		rules:
		- if: $UPDATE_PAGES
		script: