From ec0962adbfcd2b18811408e32b10e5cfe1cde5a7 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Mon, 21 Oct 2024 15:09:42 +0200 Subject: [PATCH 1/5] Extended some MR pipeline jobs to run also for ivas-float-update --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3167243ff..c0c74034a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,6 +192,7 @@ stages: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare" - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "ivas-float-update" - if: $CI_PIPELINE_SOURCE == 'push' when: never - if: $CI_PIPELINE_SOURCE == 'schedule' @@ -200,6 +201,7 @@ stages: .rules-pytest-to-main-short: rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "ivas-float-update" - if: $CI_PIPELINE_SOURCE == 'push' when: never @@ -635,6 +637,7 @@ build-codec-linux-make: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "ivas-float-update" - if: $CI_PIPELINE_SOURCE == 'schedule' - if: $CI_PIPELINE_SOURCE == 'push' when: never -- GitLab From d9151eac5745b0f6a228678f37b33c71165508e3 Mon Sep 17 00:00:00 2001 From: Jan Kiene Date: Tue, 22 Oct 2024 08:47:37 +0200 Subject: [PATCH 2/5] adaptations for MR pipelines with target ivas-float-update --- .gitlab-ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0c74034a..d664706d0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,6 +114,7 @@ stages: .build-reference-and-dut-binaries: &build-reference-and-dut-binaries - current_commit_sha=$(git rev-parse HEAD) ### build reference binaries + - echo "building reference branch: $REFERENCE_BRANCH" - git checkout $REFERENCE_BRANCH - git pull - make clean @@ -192,7 +193,6 @@ stages: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare" - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "ivas-float-update" - if: $CI_PIPELINE_SOURCE == 'push' when: never - if: $CI_PIPELINE_SOURCE == 'schedule' @@ -716,6 +716,7 @@ ivas-pytest-compare_to_main-short-dec: - TEST_SUITE="$SHORT_TEST_SUITE" - LEVEL_SCALING=1.0 - rm -rf tests/dut tests/ref + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "$REFERENCE_BRANCH" ]; then REFERENCE_BRANCH=main; fi <<: *ivas-pytest-on-merge-request-anchor ivas-pytest-compare_to_main-short-dec-lev-10: @@ -728,6 +729,7 @@ ivas-pytest-compare_to_main-short-dec-lev-10: - TEST_SUITE="$SHORT_TEST_SUITE" - LEVEL_SCALING=0.3162 - rm -rf tests/dut tests/ref + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "$REFERENCE_BRANCH" ]; then REFERENCE_BRANCH=main; fi <<: *ivas-pytest-on-merge-request-anchor ivas-pytest-compare_to_main-short-dec-lev+10: @@ -740,6 +742,7 @@ ivas-pytest-compare_to_main-short-dec-lev+10: - TEST_SUITE="$SHORT_TEST_SUITE" - LEVEL_SCALING=3.162 - rm -rf tests/dut tests/ref + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" == "$REFERENCE_BRANCH" ]; then REFERENCE_BRANCH=main; fi <<: *ivas-pytest-on-merge-request-anchor # --------------------------------------------------------------- -- GitLab From 1a25ed4304a0e17bbb5ba20e5695f75a595eedfd Mon Sep 17 00:00:00 2001 From: kiene Date: Tue, 22 Oct 2024 06:49:48 +0000 Subject: [PATCH 3/5] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d664706d0..d59ad53e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,7 +114,7 @@ stages: .build-reference-and-dut-binaries: &build-reference-and-dut-binaries - current_commit_sha=$(git rev-parse HEAD) ### build reference binaries - - echo "building reference branch: $REFERENCE_BRANCH" + - echo "building reference branch $REFERENCE_BRANCH" - git checkout $REFERENCE_BRANCH - git pull - make clean -- GitLab From e33432a0a44b9e5683186d510a03ca94a5ca75f7 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 22 Oct 2024 09:52:29 +0200 Subject: [PATCH 4/5] Change compare to ref to always run in MR pipelines. For MRs to main, the compare to main is used for the decoder, as before --- .gitlab-ci.yml | 33 ++++++++++++--------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d59ad53e7..e35c95d9d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -174,6 +174,7 @@ stages: rules: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare" - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_PIPELINE_SOURCE == 'push' when: never - if: $CI_PIPELINE_SOURCE == 'schedule' @@ -187,21 +188,9 @@ stages: - if: $CI_PIPELINE_SOURCE == 'schedule' when: never -# TODO: only temporary as long the MR encoder tests should not compare to main -.rules-pytest-to-ref-enc-short-temp: - rules: - - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare" - - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main - - if: $CI_PIPELINE_SOURCE == 'push' - when: never - - if: $CI_PIPELINE_SOURCE == 'schedule' - when: never - .rules-pytest-to-main-short: rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "ivas-float-update" + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" - if: $CI_PIPELINE_SOURCE == 'push' when: never @@ -636,8 +625,7 @@ build-codec-linux-make: rules: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "ivas-float-update" + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_PIPELINE_SOURCE == 'schedule' - if: $CI_PIPELINE_SOURCE == 'push' when: never @@ -752,38 +740,38 @@ ivas-pytest-compare_to_main-short-dec-lev+10: ### jobs that test fx encoder -> flt decoder ivas-pytest-compare_to_ref-short-enc: extends: - #- .rules-pytest-to-ref-short - - .rules-pytest-to-ref-enc-short-temp + - .rules-pytest-to-ref-short - .test-job-linux before_script: - USE_LTV=0 - DUT_DECODER_PATH=./$REF_DECODER_PATH - TEST_SUITE="$SHORT_TEST_SUITE" - LEVEL_SCALING=1.0 + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "main" ]; then REFERENCE_BRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME; fi <<: *ivas-pytest-anchor ivas-pytest-compare_to_ref-short-enc-lev-10: extends: - #- .rules-pytest-to-ref-short - - .rules-pytest-to-ref-enc-short-temp + - .rules-pytest-to-ref-short - .test-job-linux before_script: - USE_LTV=0 - DUT_DECODER_PATH=./$REF_DECODER_PATH - TEST_SUITE="$SHORT_TEST_SUITE" - LEVEL_SCALING=0.3162 + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "main" ]; then REFERENCE_BRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME; fi <<: *ivas-pytest-anchor ivas-pytest-compare_to_ref-short-enc-lev+10: extends: - #- .rules-pytest-to-ref-short - - .rules-pytest-to-ref-enc-short-temp + - .rules-pytest-to-ref-short - .test-job-linux before_script: - USE_LTV=0 - DUT_DECODER_PATH=./$REF_DECODER_PATH - TEST_SUITE="$SHORT_TEST_SUITE" - LEVEL_SCALING=3.162 + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "main" ]; then REFERENCE_BRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME; fi <<: *ivas-pytest-anchor ivas-pytest-enc-msan: @@ -820,6 +808,7 @@ ivas-pytest-compare_to_ref-short-dec: - DUT_ENCODER_PATH=./$REF_ENCODER_PATH - TEST_SUITE="$SHORT_TEST_SUITE" - LEVEL_SCALING=1.0 + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "main" ]; then REFERENCE_BRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME; fi <<: *ivas-pytest-anchor ivas-pytest-compare_to_ref-short-dec-lev-10: @@ -831,6 +820,7 @@ ivas-pytest-compare_to_ref-short-dec-lev-10: - DUT_ENCODER_PATH=./$REF_ENCODER_PATH - TEST_SUITE="$SHORT_TEST_SUITE" - LEVEL_SCALING=0.3162 + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "main" ]; then REFERENCE_BRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME; fi <<: *ivas-pytest-anchor ivas-pytest-compare_to_ref-short-dec-lev+10: @@ -842,6 +832,7 @@ ivas-pytest-compare_to_ref-short-dec-lev+10: - DUT_ENCODER_PATH=./$REF_ENCODER_PATH - TEST_SUITE="$SHORT_TEST_SUITE" - LEVEL_SCALING=3.162 + - if [ "$CI_MERGE_REQUEST_TARGET_BRANCH_NAME" != "main" ]; then REFERENCE_BRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME; fi <<: *ivas-pytest-anchor ivas-pytest-compare-to-input-short-dec: -- GitLab From 738cd4cb1114448681a8052168b1bc3f6db6d86d Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Tue, 22 Oct 2024 10:54:37 +0200 Subject: [PATCH 5/5] Change rules for MRs to main --- .gitlab-ci.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e35c95d9d..d9fe60189 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,6 +180,16 @@ stages: - if: $CI_PIPELINE_SOURCE == 'schedule' when: never +.rules-pytest-to-ref-short-dec: + rules: + - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare" + - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "main" + - if: $CI_PIPELINE_SOURCE == 'push' + when: never + - if: $CI_PIPELINE_SOURCE == 'schedule' + when: never + .rules-pytest-to-input-short: rules: - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == "pytest-compare-to-input" @@ -801,7 +811,7 @@ ivas-pytest-enc-usan: ### jobs that test flt encoder -> fx decoder ivas-pytest-compare_to_ref-short-dec: extends: - - .rules-pytest-to-ref-short + - .rules-pytest-to-ref-short-dec - .test-job-linux before_script: - USE_LTV=0 @@ -813,7 +823,7 @@ ivas-pytest-compare_to_ref-short-dec: ivas-pytest-compare_to_ref-short-dec-lev-10: extends: - - .rules-pytest-to-ref-short + - .rules-pytest-to-ref-short-dec - .test-job-linux before_script: - USE_LTV=0 @@ -825,7 +835,7 @@ ivas-pytest-compare_to_ref-short-dec-lev-10: ivas-pytest-compare_to_ref-short-dec-lev+10: extends: - - .rules-pytest-to-ref-short + - .rules-pytest-to-ref-short-dec - .test-job-linux before_script: - USE_LTV=0 -- GitLab