From 3cdf577b7798bb07d5676014f0c2a944bfde4f08 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 26 Jan 2024 11:36:33 +0100 Subject: [PATCH 1/4] checkout basop ci branch instead of fixed commit --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a43ae5e0..f0b3ddf9e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ variables: TEST_SUITE: "" LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' + BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch" 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' @@ -97,9 +98,8 @@ stages: .update-scripts-repo: &update-scripts-repo - cd $SCRIPTS_DIR - # - git pull - # Temp hack to enable the MR tests to pass @millsa approved this change - - git checkout 8045b28b1d07dd91cadf9ead1392fe5a89f72d5a + - git checkout $BASOP_CI_BRANCH_PC_REPO + - git pull - cd - - cp -r $SCRIPTS_DIR/ci . - cp -r $SCRIPTS_DIR/scripts . -- GitLab From 0116f664e3a75e54092c2aede2de1859692d3e4a Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 26 Jan 2024 11:40:53 +0100 Subject: [PATCH 2/4] add fetch before checkout --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f0b3ddf9e..b981e15ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,6 +98,7 @@ stages: .update-scripts-repo: &update-scripts-repo - cd $SCRIPTS_DIR + - git fetch - git checkout $BASOP_CI_BRANCH_PC_REPO - git pull - cd - -- GitLab From b6759b5a692daa6d03246efbfbe650bd92335d28 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 26 Jan 2024 11:47:10 +0100 Subject: [PATCH 3/4] add correct fetch command for single-branch clone --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b981e15ef..3dd2ab6a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,7 +98,7 @@ stages: .update-scripts-repo: &update-scripts-repo - cd $SCRIPTS_DIR - - git fetch + - git fetch origin $BASOP_CI_BRANCH_PC_REPO - git checkout $BASOP_CI_BRANCH_PC_REPO - git pull - cd - -- GitLab From a1ecb655575ca500bee81378288b41e370909e00 Mon Sep 17 00:00:00 2001 From: knj Date: Fri, 26 Jan 2024 11:52:39 +0100 Subject: [PATCH 4/4] set the branch via remote instead --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dd2ab6a4..0bcd5d7be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,7 +98,8 @@ stages: .update-scripts-repo: &update-scripts-repo - cd $SCRIPTS_DIR - - git fetch origin $BASOP_CI_BRANCH_PC_REPO + - git remote set-branches --add origin $BASOP_CI_BRANCH_PC_REPO + - git fetch - git checkout $BASOP_CI_BRANCH_PC_REPO - git pull - cd - -- GitLab