Commit a39fa5bf authored by Jan Kiene's avatar Jan Kiene
Browse files

correct reference branch selection

parent d9342024

.gitlab-ci.yml

+13 −13
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ variables: 
  LTV_DIR: "/usr/local/ltv"

  EVS_BE_TEST_DIR_BASOP: "/usr/local/be_2_evs_basop"

  REFERENCE_BRANCH: "ivas-float-update"

  # this is intentionally set to a nonsense value to trigger a clear error if there is a flaw in the variable setting logic

  REFERENCE_BRANCH_LOCAL: "xa34wshgaweedfaerssfgsfdg"

  BUILD_OUTPUT: "build_output.txt"

  SCRIPTS_DIR: "/usr/local/scripts"

  EXIT_CODE_NON_BE: 123
@@ -55,7 +57,7 @@ workflow: 
    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare'

      variables:

        IVAS_PIPELINE_NAME: 'Run comparison tools against float ref: $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-comapre-long'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-compare-long'

      variables:

        IVAS_PIPELINE_NAME: 'Run comparison tools against float ref (long test vectors): $CI_COMMIT_BRANCH'

    - if: $CI_PIPELINE_SOURCE == 'web' && $MANUAL_PIPELINE_TYPE == 'pytest-saturation-smoke-test'
@@ -99,6 +101,11 @@ stages: 
  - current_commit_sha=$(git rev-parse HEAD)

  ### build reference binaries

  - git checkout $REFERENCE_BRANCH_LOCAL

  # safeguard check to detect possible mistakes in the reference branch selection logic

  - if [ "$?" != "0" ]; then

  -     echo "REFERENCE_BRANCH_LOCAL variable is set incorrectly: $REFERENCE_BRANCH_LOCAL!"

  -     exit(1)

  - fi

  - git pull

  - make clean

  - make -j
@@ -227,6 +234,11 @@ stages: 
    - else

    -    testcase_timeout=$TESTCASE_TIMEOUT_STV

    - fi



    - if [ $CI_PIPELINE_SOURCE == "web" || $CI_PIPELINE_SOURCE == "schedule" ]; then

    -    REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

    - fi



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES

    - if [ $LEVEL_SCALING != "1.0" ];then

    -   *apply-testv-scaling
@@ -421,7 +433,6 @@ ivas-pytest-compare-enc: 
    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=1.0

    - REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

  <<: *ivas-pytest-anchor



ivas-pytest-compare-enc-lev-10:
@@ -433,7 +444,6 @@ ivas-pytest-compare-enc-lev-10: 
    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=0.3162

    - REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

  <<: *ivas-pytest-anchor



ivas-pytest-compare-enc-lev+10:
@@ -445,7 +455,6 @@ ivas-pytest-compare-enc-lev+10: 
    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=3.162

    - REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

  <<: *ivas-pytest-anchor



ivas-pytest-enc-msan:
@@ -482,7 +491,6 @@ ivas-pytest-compare_main-short-dec: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=1.0

    - REFERENCE_BRANCH_LOCAL="main"

  <<: *ivas-pytest-anchor

  

ivas-pytest-compare_main-short-lev-10:
@@ -494,7 +502,6 @@ ivas-pytest-compare_main-short-lev-10: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=0.3162

    - REFERENCE_BRANCH_LOCAL="main"

  <<: *ivas-pytest-anchor

  

ivas-pytest-compare_main-short-dec-lev+10:
@@ -506,7 +513,6 @@ ivas-pytest-compare_main-short-dec-lev+10: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$SHORT_TEST_SUITE"

    - LEVEL_SCALING=3.162

    - REFERENCE_BRANCH_LOCAL="main"

  <<: *ivas-pytest-anchor



ivas-pytest-dec-msan-short:
@@ -546,7 +552,6 @@ ivas-pytest-compare_ref-long-enc: 
    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=1.0

    - REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

  <<: *ivas-pytest-anchor

  

ivas-pytest-compare_ref-long-dec:
@@ -558,7 +563,6 @@ ivas-pytest-compare_ref-long-dec: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=1.0

    - REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

  <<: *ivas-pytest-anchor

  

ivas-pytest-compare_ref-long-enc-lev-10:
@@ -570,7 +574,6 @@ ivas-pytest-compare_ref-long-enc-lev-10: 
    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=0.3162

    - REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

  <<: *ivas-pytest-anchor

  

ivas-pytest-compare_ref-long-dec-lev-10:
@@ -582,7 +585,6 @@ ivas-pytest-compare_ref-long-dec-lev-10: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=0.3162

    - REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

  <<: *ivas-pytest-anchor



ivas-pytest-compare_ref-long-enc-lev+10:
@@ -594,7 +596,6 @@ ivas-pytest-compare_ref-long-enc-lev+10: 
    - DUT_DECODER_PATH=./IVAS_dec_ref

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=3.162

    - REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

  <<: *ivas-pytest-anchor

  

ivas-pytest-compare_ref-long-dec-lev+10:
@@ -606,7 +607,6 @@ ivas-pytest-compare_ref-long-dec-lev+10: 
    - DUT_ENCODER_PATH=./IVAS_cod_ref

    - TEST_SUITE="$LONG_TEST_SUITE"

    - LEVEL_SCALING=3.162

    - REFERENCE_BRANCH_LOCAL="$REFERENCE_BRANCH"

  <<: *ivas-pytest-anchor



ivas-smoke-test-saturation: