cleanup - remove double update-scripts.sh calls (27280f34) · Commits · IVAS Codec Public Collaboration / IVAS Codec CI

main-basop.yml

+1 −18

Original line number	Diff line number	Diff line
		@@ -215,11 +215,7 @@ workflow:
		# Job templates
		# ---------------------------------------------------------------

		# override for centrally defined job to make use of the basop runners
		.job-linux:
		tags:
		- ivas-linux

		# override for centrally defined job to add the before_script section
		# custom variant of this template, we need to update the scripts repo before every build
		.test-job-linux:
		extends:
		@@ -264,7 +260,6 @@ workflow:

		- set -euxo pipefail
		- 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
		- if [ $USE_LTV -eq 1 ]; then
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
		@@ -406,7 +401,6 @@ workflow:

		- set -euxo pipefail

		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
		- python3 tests/create_short_testvectors.py

		- if [ $USE_LTV -eq 1 ]; then
		@@ -532,8 +526,6 @@ workflow:
		- exit 0
		- fi

		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh

		- if [ $USE_LTV -eq 1 ]; then
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
		@@ -670,7 +662,6 @@ workflow:
		- !reference [ .job-linux, before_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
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh

		- set -euxo pipefail
		@@ -712,7 +703,6 @@ workflow:
		- !reference [ .job-linux, before_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
		- if [ $USE_LTV -eq 1 ]; then
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/update-ltv-repo.sh
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/copy-ltv-files-to-testv-dir.sh
		@@ -876,7 +866,6 @@ clang-format-check:
		needs: []
		timeout: "10 minutes"
		script:
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/update-scripts-repo.sh
		# Set up variables. This can't be done in the "variables" section because variables are not expanded properly there
		- PATCH_FILE_NAME="$ARTIFACT_BASE_NAME".patch
		- >
		@@ -1230,7 +1219,6 @@ renderer-pytest-on-merge-request:
		REPORT_CSV: "report--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"
		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
		- 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
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/merge-request-print-pinned-commits.sh
		@@ -1303,7 +1291,6 @@ ivas-pytest-on-merge-request:
		- 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
		- 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
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/merge-request-print-pinned-commits.sh
		@@ -1374,7 +1361,6 @@ split-rendering-pytest-on-merge-request:
		REPORT_CSV: "report--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"
		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
		- 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
		- bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/merge-request-print-pinned-commits.sh
		@@ -1555,7 +1541,6 @@ split-rendering-smoke-test:
		stage: test
		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

		- make -j
		- testcase_timeout=10
		@@ -1579,7 +1564,6 @@ lc3-wrapper-unit-test:
		stage: test
		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

		- cmake -B cmake-build -G "Unix Makefiles" -DCOPY_EXECUTABLES_FROM_BUILD_DIR=true
		- cmake --build cmake-build -- -j
		@@ -1732,7 +1716,6 @@ lc3-wrapper-unit-test:
		# set CLANG_NUM, SELFTEST_SANITY_TIMEOUT and SELF_TEST_PRM_FILE in before_script section
		.sanitizer-selftest-anchor: &sanitizer-selftest-anchor
		- 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
		- testcase_timeout=$SELFTEST_SANITY_TIMEOUT
		- export UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1,print_stacktrace=1