From ac50c674deabcad41ccb547f1b28d914c15a658f Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 5 Mar 2024 15:28:21 +0100 Subject: [PATCH 1/5] adapt to float ci update --- .gitlab-ci.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 355d85505..0b61d50ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -115,13 +115,6 @@ stages: - cp -r $SCRIPTS_DIR/tests . - cp $SCRIPTS_DIR/pytest.ini . -# TODO: this needs to be updated in case the reference is updated -.remove-unsupported-testcases: &remove-unsupported-testcases - - sed -i '1701,1707d' scripts/config/self_test.prm - - sed -i '1659,1661d' scripts/config/self_test.prm - - sed -i '1635,1637d' scripts/config/self_test.prm - - sed -i '1603,1605d' scripts/config/self_test.prm - .apply-testv-scaling: &apply-testv-scaling - echo "Applying level scaling in scripts/testv using scale=$LEVEL_SCALING" - tests/scale_pcm.py ./scripts/testv/ $LEVEL_SCALING @@ -190,7 +183,7 @@ stages: - *update-ltv-repo - *copy-ltv-files-to-testv-dir - fi - - *remove-unsupported-testcases + - python3 ci/remove_unsupported_testcases.py - if [ $LEVEL_SCALING != "1.0" ];then - *apply-testv-scaling - fi @@ -244,7 +237,7 @@ stages: script: - *print-common-info - *update-scripts-repo - - *remove-unsupported-testcases + - python3 ci/remove_unsupported_testcases.py - *setup-codec - make clean - make -j CLANG=$CLANG_NUM -- GitLab From b108933e2b4546e2effbae4e939b9832ab02b445 Mon Sep 17 00:00:00 2001 From: knj Date: Tue, 5 Mar 2024 16:07:22 +0100 Subject: [PATCH 2/5] correct usage of script --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b61d50ef..296ff2248 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ variables: LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch" + PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm" MANUAL_PIPELINE_TYPE: description: "Type for the manual pipeline run. Use 'pytest-mld' to run MLD test against reference float codec." # Not implemented yet, but may be good to have a manual pipeline trigger value: 'default' @@ -183,7 +184,7 @@ stages: - *update-ltv-repo - *copy-ltv-files-to-testv-dir - fi - - python3 ci/remove_unsupported_testcases.py + - python3 ci/remove_unsupported_testcases.py $PRM_FILES - if [ $LEVEL_SCALING != "1.0" ];then - *apply-testv-scaling - fi @@ -237,7 +238,7 @@ stages: script: - *print-common-info - *update-scripts-repo - - python3 ci/remove_unsupported_testcases.py + - python3 ci/remove_unsupported_testcases.py $PRM_FILES - *setup-codec - make clean - make -j CLANG=$CLANG_NUM -- GitLab From 6e61298df07cbd7c04af22ee56cda7387c3ab21c Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 6 Mar 2024 14:10:20 +0100 Subject: [PATCH 3/5] add --prune option to fetch command --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 296ff2248..8b698220a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,7 +107,7 @@ stages: .update-scripts-repo: &update-scripts-repo - cd $SCRIPTS_DIR - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO - - git fetch + - git fetch --prune - git checkout $BASOP_CI_BRANCH_PC_REPO - git pull - cd - -- GitLab From 6b00f778eff75677aed1ef1844cd0cd86db9c4d1 Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 6 Mar 2024 14:12:36 +0100 Subject: [PATCH 4/5] add debug output --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8b698220a..6643c8922 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,6 +107,7 @@ stages: .update-scripts-repo: &update-scripts-repo - cd $SCRIPTS_DIR - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO + - git branch - git fetch --prune - git checkout $BASOP_CI_BRANCH_PC_REPO - git pull -- GitLab From 84dd8de87c6d4d174e36915e5b80f61bd657a09c Mon Sep 17 00:00:00 2001 From: knj Date: Wed, 6 Mar 2024 14:22:37 +0100 Subject: [PATCH 5/5] try another command --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6643c8922..36e94aec6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,8 +107,9 @@ stages: .update-scripts-repo: &update-scripts-repo - cd $SCRIPTS_DIR - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO + - git remote prune origin - git branch - - git fetch --prune + - git fetch - git checkout $BASOP_CI_BRANCH_PC_REPO - git pull - cd - -- GitLab