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

Merge branch 'main' into kiene/fix-keep-float-commit-in-basop-mr-pipelines

parents c9521b53 63bbf925

main-basop.yml

+23 −11
Original line number Diff line number Diff line
@@ -1294,10 +1294,17 @@ ivas-pytest-on-merge-request: 
    - .rules-merge-request-no-draft

  stage: compare

  timeout: "50 minutes"

  parallel:

    matrix:

      # note: keep in sync with list in $TESTS_DIR_CODEC_BE_ON_MR

      - PYTEST_SCRIPT:

          - test_param_file.py

          - test_sba.py

  variables:

    REPORT_XML: "report--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.xml"

    REPORT_HTML: "report--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.html"

    REPORT_CSV: "report--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"

    # NOTE: can not use $CI_JOB_NAME here in the filenames, as this includes the ": .[test_param_file.py]" suffix from the matrixing

    REPORT_XML: "report--ivas_pytest_on_merge_request-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.xml"

    REPORT_HTML: "report--ivas_pytest_on_merge_request-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.html"

    REPORT_CSV: "report--ivas_pytest_on_merge_request-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"

  tags:

    - ivas-basop-linux

  script:
@@ -1328,7 +1335,7 @@ ivas-pytest-on-merge-request: 


    ### prepare pytest

    # create references

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --update_ref 1

    - python3 -m pytest "$TESTS_DIR_CODEC_BE_ON_MR"/"$PYTEST_SCRIPT" -v --update_ref 1



    ### Run test using branch scripts and input

    - if [ $ref_using_target == 1 ]; then git checkout $source_branch_commit_sha; fi
@@ -1336,7 +1343,7 @@ ivas-pytest-on-merge-request: 
    ### run pytest

    - exit_code=0

    - testcase_timeout=600

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --mld --ssnr --odg --html=$REPORT_HTML --self-contained-html --junit-xml=$REPORT_XML --testcase_timeout=$testcase_timeout || exit_code=$?

    - python3 -m pytest "$TESTS_DIR_CODEC_BE_ON_MR"/"$PYTEST_SCRIPT" -v --mld --ssnr --odg --html=$REPORT_HTML --self-contained-html --junit-xml=$REPORT_XML --testcase_timeout=$testcase_timeout || exit_code=$?

    - zero_errors=$(cat $REPORT_XML | grep -c 'errors="0"') || true



    - python3 scripts/parse_xml_report.py $REPORT_XML $REPORT_CSV
@@ -1347,7 +1354,7 @@ ivas-pytest-on-merge-request: 
    exit_codes:

      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    paths:
@@ -1456,7 +1463,7 @@ codec-smoke-test: 
    - if cat smoke_test_output_hrtf.txt | grep -c "failed"; then echo "Smoke test with external hrtf files failed"; ret_val=1; fi

    - exit $ret_val

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    paths:
@@ -1553,7 +1560,7 @@ ivas-interop-on-merge-request: 
    exit_codes:

      - 123

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    paths:
@@ -1728,10 +1735,11 @@ renderer-usan: 
  stage: test

  needs: ["build-codec-sanitizers-linux"]

  extends:

    - .rules-merge-request-no-draft

    # TODO: also run on ivas-float-update once bugs are fixed

    - .rules-merge-request-to-main-no-draft

    - .test-job-linux

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    paths:
@@ -1758,6 +1766,10 @@ renderer-usan: 
    - testcase_timeout=$SELFTEST_SANITY_TIMEOUT

    - export UBSAN_OPTIONS=suppressions=scripts/ubsan.supp,report_error_type=1



    - if [ "$DISABLE_HRTF" = "true" ]; then

    -   export PYTEST_ADDOPTS="${PYTEST_ADDOPTS} -k 'not model'"

    - fi



    - python3 ci/remove_unsupported_testcases.py $PRM_FILES



    - make_args="CLANG=$CLANG_NUM"
@@ -2446,7 +2458,7 @@ check-be-between-renderer-framesizes: 
    - if [ $exit_code10 -ne 0 ]; then echo "Non-bitexact cases encountered with 10ms rendering!"; exit_code=1; fi

    - if [ $exit_code -ne 0 ]; then exit $EXIT_CODE_FAIL; fi

  artifacts:

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--stage-$CI_JOB_STAGE--results"

    name: "mr-$CI_MERGE_REQUEST_IID--sha-$CI_COMMIT_SHORT_SHA--job-$CI_JOB_NAME--results"

    expire_in: 1 week

    when: always

    expose_as: "pytest 5ms and 10ms vs 20ms results"