From 7325085ac0e62f1a4789fed8d14d31146228635a Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 25 Nov 2025 13:36:04 +0100 Subject: [PATCH 1/2] remove BASOP_CI_BRANCH_PC_REPO variable --- includes/default-variables.yml | 1 - snippets/basop/update-scripts-repo.sh | 7 ++----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/includes/default-variables.yml b/includes/default-variables.yml index 6329664..91dbd1e 100644 --- a/includes/default-variables.yml +++ b/includes/default-variables.yml @@ -10,7 +10,6 @@ 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: "" # 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 47a1cb8..9d44939 100755 --- a/snippets/basop/update-scripts-repo.sh +++ b/snippets/basop/update-scripts-repo.sh @@ -9,10 +9,7 @@ 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 +git remote set-branches --add origin main git fetch @@ -20,7 +17,7 @@ git fetch git restore --staged . git restore . -git checkout "$BASOP_CI_BRANCH_PC_REPO" +git checkout main git pull popd -- GitLab From 305ae6f35bd35b94d48d25b84eefa92018dfaf0a Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 25 Nov 2025 14:59:42 +0100 Subject: [PATCH 2/2] bring configurable branch for ci scripts back --- includes/default-variables.yml | 2 ++ snippets/basop/update-scripts-repo.sh | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/includes/default-variables.yml b/includes/default-variables.yml index 91dbd1e..aee1d99 100644 --- a/includes/default-variables.yml +++ b/includes/default-variables.yml @@ -11,5 +11,7 @@ variables: TESTCASE_TIMEOUT_LTV_SANITIZERS: 2400 SCALE_FACTOR: "3.162" 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 9d44939..5a701a3 100755 --- a/snippets/basop/update-scripts-repo.sh +++ b/snippets/basop/update-scripts-repo.sh @@ -9,7 +9,9 @@ pushd "${SCRIPTS_DIR}" # Remove all fetch lines to clean out dead links sed -i '/fetch/d' .git/config -git remote set-branches --add origin 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 @@ -17,7 +19,7 @@ git fetch git restore --staged . git restore . -git checkout main +git checkout $BASOP_CI_SCRIPTS_BRANCH git pull popd -- GitLab