Commit e33432a0 authored by norvell's avatar norvell
Browse files

Change compare to ref to always run in MR pipelines. For MRs to main, the...

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
parent 1a25ed43
Loading
Loading
Loading
Loading
Loading
+12 −21
Original line number Diff line number Diff line
@@ -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: