diff --git a/includes/default-variables.yml b/includes/default-variables.yml index 6329664102945f6734e9e5a8179e46df00fd30f2..aee1d994c726cde201827b94c2c83863de93effe 100644 --- a/includes/default-variables.yml +++ b/includes/default-variables.yml @@ -10,7 +10,8 @@ variables: TESTCASE_TIMEOUT_STV_SANITIZERS: 240 TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400 SCALE_FACTOR: "3.162" - BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch" PYTEST_ADDOPTS: "" + # this contains the name of the branch in ivas-codec repo that is used to copy the ci scripts from + BASOP_CI_SCRIPTS_BRANCH: "main" # overwrite this via .gitlab/variables.yml in the respective other repo to disable "(model from file)" testcases DISABLE_HRTF: "false" diff --git a/snippets/basop/update-scripts-repo.sh b/snippets/basop/update-scripts-repo.sh index 47a1cb88143f8eff87effee899a5a6c72eaaf35c..5a701a3836b67877b6f7677fa28ec70d0cda7e2f 100755 --- a/snippets/basop/update-scripts-repo.sh +++ b/snippets/basop/update-scripts-repo.sh @@ -9,10 +9,9 @@ pushd "${SCRIPTS_DIR}" # Remove all fetch lines to clean out dead links sed -i '/fetch/d' .git/config -# Add currently used branches: -# - BASOP_CI_BRANCH_PC_REPO for scripts/tests -# - main for getting the float ref codec -git remote set-branches --add origin "$BASOP_CI_BRANCH_PC_REPO" main +# we need main for getting the float reference code +# BASOP_CI_SCRIPTS_BRANCH is per default main as well, but can be overwritten to test things before merging +git remote set-branches --add origin main $BASOP_CI_SCRIPTS_BRANCH git fetch @@ -20,7 +19,7 @@ git fetch git restore --staged . git restore . -git checkout "$BASOP_CI_BRANCH_PC_REPO" +git checkout $BASOP_CI_SCRIPTS_BRANCH git pull popd