Add set-merge-config anchor to resolve line-endings conflict (09f63f81) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci.yml

+45 −0

Original line number	Diff line number	Diff line
		@@ -144,6 +144,10 @@ stages:

		# These can be used later on to do common tasks

		.set-merge-config: &set-merge-config
		- git config set merge.renormalize \|\| true
		- git config --local merge.renormalize true \|\| true

		# Prints useful information for every job and should be used at the beginning of each job
		.print-common-info: &print-common-info
		- \|
		@@ -339,6 +343,8 @@ stages:
		.test-job-linux:
		tags:
		- ivas-basop-linux
		before_script:
		- *set-merge-config

		.build-job-linux:
		stage: build
		@@ -361,6 +367,7 @@ stages:
		.test-job-linux-needs-testv-dir:
		extends: .test-job-linux
		before_script:
		- *set-merge-config
		- *update-scripts-repo
		- if [ ! -d "$TESTV_DIR" ]; then mkdir -p $TESTV_DIR; fi
		- cp -r scripts/testv/* $TESTV_DIR/
		@@ -1055,6 +1062,7 @@ check-be-to-target-short-enc-0db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_DECODER_PATH=./IVAS_dec_ref
		- MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
		@@ -1068,6 +1076,7 @@ check-be-to-target-short-enc-+10db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_DECODER_PATH=./IVAS_dec_ref
		- MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
		@@ -1081,6 +1090,7 @@ check-be-to-target-short-enc--10db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_DECODER_PATH=./IVAS_dec_ref
		- MERGE_TARGET_DECODER_PATH=./IVAS_dec_ref
		@@ -1094,6 +1104,7 @@ check-be-to-target-short-dec-0db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./IVAS_cod_ref
		- MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
		@@ -1107,6 +1118,7 @@ check-be-to-target-short-dec-+10db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./IVAS_cod_ref
		- MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
		@@ -1120,6 +1132,7 @@ check-be-to-target-short-dec--10db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./IVAS_cod_ref
		- MERGE_TARGET_ENCODER_PATH=./IVAS_cod_ref
		@@ -1138,6 +1151,7 @@ check-regressions-short-enc-0db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_DECODER_PATH=./IVAS_dec_ref
		- TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		@@ -1154,6 +1168,7 @@ check-regressions-short-enc-+10db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_DECODER_PATH=./IVAS_dec_ref
		- TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		@@ -1170,6 +1185,7 @@ check-regressions-short-enc--10db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_DECODER_PATH=./IVAS_dec_ref
		- TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		@@ -1186,6 +1202,7 @@ check-regressions-short-dec-0db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./IVAS_cod_ref
		- TEST_SUITE="$SHORT_TEST_SUITE"
		@@ -1202,6 +1219,7 @@ check-regressions-short-dec-+10db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./IVAS_cod_ref
		- TEST_SUITE="$SHORT_TEST_SUITE"
		@@ -1218,6 +1236,7 @@ check-regressions-short-dec--10db:
		- .rules-pytest-to-main-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./IVAS_cod_ref
		- TEST_SUITE="$SHORT_TEST_SUITE"
		@@ -1235,6 +1254,7 @@ ivas-pytest-compare_to_ref-short-enc:
		- .rules-pytest-to-ref-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- ENCODER_TEST="true"
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		@@ -1247,6 +1267,7 @@ ivas-pytest-compare_to_ref-short-enc-lev-10:
		- .rules-pytest-to-ref-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- ENCODER_TEST="true"
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		@@ -1259,6 +1280,7 @@ ivas-pytest-compare_to_ref-short-enc-lev+10:
		- .rules-pytest-to-ref-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- ENCODER_TEST="true"
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		@@ -1272,6 +1294,7 @@ ivas-pytest-compare_to_ref-dmx-short-enc:
		- .rules-pytest-to-ref-enc-sort-dmx
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- ENCODER_TEST="true"
		- COMPARE_DMX="true"
		@@ -1285,6 +1308,7 @@ ivas-pytest-compare_to_ref-dmx-short-enc-lev-10:
		- .rules-pytest-to-ref-enc-sort-dmx
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- ENCODER_TEST="true"
		- COMPARE_DMX="true"
		@@ -1298,6 +1322,7 @@ ivas-pytest-compare_to_ref-dmx-short-enc-lev+10:
		- .rules-pytest-to-ref-enc-sort-dmx
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- ENCODER_TEST="true"
		- COMPARE_DMX="true"
		@@ -1312,6 +1337,7 @@ ivas-pytest-enc-msan:
		tags:
		- ivas-basop-linux-fast
		before_script:
		- *set-merge-config
		- CLANG_NUM=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_ENCODER
		@@ -1323,6 +1349,7 @@ ivas-pytest-enc-asan:
		tags:
		- ivas-basop-linux-fast
		before_script:
		- *set-merge-config
		- CLANG_NUM=2
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_ENCODER
		@@ -1334,6 +1361,7 @@ ivas-pytest-enc-usan:
		tags:
		- ivas-basop-linux-fast
		before_script:
		- *set-merge-config
		- CLANG_NUM=3
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_ENCODER
		@@ -1345,6 +1373,7 @@ ivas-pytest-compare_to_ref-short-dec:
		- .rules-pytest-to-ref-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$SHORT_TEST_SUITE"
		@@ -1356,6 +1385,7 @@ ivas-pytest-compare_to_ref-short-dec-lev-10:
		- .rules-pytest-to-ref-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$SHORT_TEST_SUITE"
		@@ -1367,6 +1397,7 @@ ivas-pytest-compare_to_ref-short-dec-lev+10:
		- .rules-pytest-to-ref-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$SHORT_TEST_SUITE"
		@@ -1379,6 +1410,7 @@ ivas-pytest-compare-to-input-short-dec:
		- .rules-pytest-to-input-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$SHORT_TEST_SUITE"
		@@ -1390,6 +1422,7 @@ ivas-pytest-compare-to-input-short-enc:
		- .rules-pytest-to-input-short
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$SHORT_TEST_SUITE_ENCODER"
		@@ -1402,6 +1435,7 @@ ivas-pytest-dec-msan:
		tags:
		- ivas-basop-linux-fast
		before_script:
		- *set-merge-config
		- CLANG_NUM=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER
		@@ -1413,6 +1447,7 @@ ivas-pytest-dec-asan:
		tags:
		- ivas-basop-linux-fast
		before_script:
		- *set-merge-config
		- CLANG_NUM=2
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER
		@@ -1424,6 +1459,7 @@ ivas-pytest-dec-usan:
		tags:
		- ivas-basop-linux-fast
		before_script:
		- *set-merge-config
		- CLANG_NUM=3
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE=$LONG_TEST_SUITE_NO_RENDERER
		@@ -1438,6 +1474,7 @@ ivas-pytest-compare_ref-long-enc:
		- .rules-pytest-long
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
		@@ -1450,6 +1487,7 @@ ivas-pytest-compare_ref-long-dec:
		- .rules-pytest-long
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE"
		@@ -1462,6 +1500,7 @@ ivas-pytest-compare_ref-long-enc-lev-10:
		- .rules-pytest-long
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
		@@ -1474,6 +1513,7 @@ ivas-pytest-compare_ref-long-dec-lev-10:
		- .rules-pytest-long
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE"
		@@ -1486,6 +1526,7 @@ ivas-pytest-compare_ref-long-enc-lev+10:
		- .rules-pytest-long
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=1
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE_ENCODER"
		@@ -1498,6 +1539,7 @@ ivas-pytest-compare_ref-long-dec-lev+10:
		- .rules-pytest-long
		- .test-job-linux
		before_script:
		- *set-merge-config
		- USE_LTV=1
		- DUT_ENCODER_PATH=./$REF_ENCODER_PATH
		- TEST_SUITE="$LONG_TEST_SUITE"
		@@ -1649,6 +1691,7 @@ ivas-pytest-renderer:
		rules:
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-renderer"
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- TEST_SUITE="tests/renderer"
		- LEVEL_SCALING=1.0
		@@ -1660,6 +1703,7 @@ peaq-enc-passthrough:
		rules:
		- if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "peaq-enc-passthrough"
		before_script:
		- *set-merge-config
		- USE_LTV=0
		- DUT_DECODER_PATH=./$REF_DECODER_PATH
		- TEST_SUITE="tests/test_enc_passthrough.py"
		@@ -1768,6 +1812,7 @@ voip-be-on-merge-request:
		GET_WMOPS_ARGS: "mem_only"
		timeout: 3 hours 30 minutes
		before_script:
		- *set-merge-config
		- *print-common-info
		- *update-scripts-repo
		- *update-ltv-repo