Commit 33cdc8fb authored by Jan Kiene's avatar Jan Kiene
Browse files

use other jobs for encoder for naming clarity

parent e9c37e99

.gitlab-ci.yml

+51 −48
Original line number Diff line number Diff line
@@ -169,6 +169,17 @@ 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
@@ -272,7 +283,7 @@ stages: 
    - if [ $zero_errors != 1 ]; then

    -     echo "Run errors encountered!"

    # TODO: temporary only to not fail pipelines on crashes in encoder

    -     if [[ "$CI_JOB_NAME" =~ "ivas-pytest-compare_to_main-short-enc" ]]; then

    -     if [[ "$CI_JOB_NAME" =~ "ivas-pytest-compare_to_ref-short-enc" ]]; then

    -         exit $EXIT_CODE_NON_BE

    -     else

    -         exit $EXIT_CODE_FAIL
@@ -334,12 +345,6 @@ stages: 
    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - allow_regressions_flag=$(grep -c --ignore-case "\[allow[ -]*regression\]" tmp.txt) || true



    # TODO: temporary patch, remove once encoder is stable

    # allow regressions for encoder tests

    - if [[ "$CI_JOB_NAME" =~ "ivas-pytest-compare_to_main-short-enc" ]]; then

    -   allow_regressions_flag=1

    - fi



    ### run branch first

    # this per default builds the branch and the reference and creates the reference outputs

    - *build-and-create-reference-outputs
@@ -531,43 +536,38 @@ build-codec-linux-instrumented-make: 
# ---------------------------------------------------------------



### jobs that test fx encoder -> flt decoder

ivas-pytest-compare_to_main-short-enc:

  extends:

    - .rules-pytest-to-main-short

    - .test-job-linux

  before_script:

    - USE_LTV=0

    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=1.0

  # TODO: use other anchor once encoder is stable

  <<: *ivas-pytest-anchor

# TODO: reenable once encoder tests shall compare to main

# ivas-pytest-compare_to_main-short-enc:

#   extends:

#     - .rules-pytest-to-main-short

#     - .test-job-linux

#   before_script:

#     - USE_LTV=0

#     - DUT_DECODER_PATH=./IVAS_dec_ref

#     - TEST_SUITE="$SHORT_TEST_SUITE"

#     - LEVEL_SCALING=1.0

#   <<: *ivas-pytest-on-merge-request-anchor



ivas-pytest-compare_to_main-short-enc-lev-10:

  extends:

    - .rules-pytest-to-main-short

    - .test-job-linux

  before_script:

    - USE_LTV=0

    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=0.3162

  # TODO: use other anchor once encoder is stable

  <<: *ivas-pytest-anchor

# ivas-pytest-compare_to_main-short-enc-lev-10:

#   extends:

#     - .rules-pytest-to-main-short

#     - .test-job-linux

#   before_script:

#     - USE_LTV=0

#     - DUT_DECODER_PATH=./IVAS_dec_ref

#     - TEST_SUITE="$SHORT_TEST_SUITE"

#     - LEVEL_SCALING=0.3162

#   <<: *ivas-pytest-on-merge-request-anchor



ivas-pytest-compare_to_main-short-enc-lev+10:

  extends:

    - .rules-pytest-to-main-short

    - .test-job-linux

  before_script:

    - USE_LTV=0

    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=3.162

  # TODO: use other anchor once encoder is stable

  <<: *ivas-pytest-anchor

# ivas-pytest-compare_to_main-short-enc-lev+10:

#   extends:

#     - .rules-pytest-to-main-short

#     - .test-job-linux

#   before_script:

#     - USE_LTV=0

#     - DUT_DECODER_PATH=./IVAS_dec_ref

#     - TEST_SUITE="$SHORT_TEST_SUITE"

#     - LEVEL_SCALING=3.162

#   <<: *ivas-pytest-on-merge-request-anchor



### jobs that test flt encoder -> fx decoder
@@ -611,7 +611,8 @@ 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-short

    - .rules-pytest-to-ref-enc-short-temp

    - .test-job-linux

  before_script:

    - USE_LTV=0
@@ -622,7 +623,8 @@ ivas-pytest-compare_to_ref-short-enc: 


ivas-pytest-compare_to_ref-short-enc-lev-10:

  extends:

    - .rules-pytest-to-ref-short

    #- .rules-pytest-to-ref-short

    - .rules-pytest-to-ref-enc-short-temp

    - .test-job-linux    

  before_script:

    - USE_LTV=0
@@ -633,7 +635,8 @@ ivas-pytest-compare_to_ref-short-enc-lev-10: 


ivas-pytest-compare_to_ref-short-enc-lev+10:

  extends:

    - .rules-pytest-to-ref-short

    #- .rules-pytest-to-ref-short

    - .rules-pytest-to-ref-enc-short-temp

    - .test-job-linux    

  before_script:

    - USE_LTV=0