Commit 30ac884b authored by Jan Kiene's avatar Jan Kiene
Browse files

synch gitlab-ci.yml

parent b0bba524

.gitlab-ci.yml

+15 −10
Original line number Diff line number Diff line
@@ -435,7 +435,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:
@@ -523,7 +523,7 @@ pytest-compare-20ms-and-5ms-rendering: 
    - 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"
@@ -824,6 +824,12 @@ ivas-pytest-on-merge-request: 
  stage: compare

  needs: ["build-codec-linux-cmake", "codec-smoke-test"]

  timeout: "14 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

  script:

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/print-common-info.sh

    - commits_behind_count="$(bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/get-commits-behind-count.sh)"
@@ -841,7 +847,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_main == 1 ]; then git checkout $source_branch_commit_sha; fi
@@ -849,7 +855,7 @@ ivas-pytest-on-merge-request: 
    ### run pytest

    - exit_code=0

    - testcase_timeout=60

    - python3 -m pytest $TESTS_DIR_CODEC_BE_ON_MR -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout || exit_code=$?

    - python3 -m pytest "$TESTS_DIR_CODEC_BE_ON_MR"/"$PYTEST_SCRIPT" -v --html=report.html --self-contained-html --junit-xml=report-junit.xml --testcase_timeout=$testcase_timeout || exit_code=$?

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true



    - *merge-request-comparison-check
@@ -858,7 +864,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:
@@ -908,7 +914,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:
@@ -960,7 +966,7 @@ evs-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:
@@ -1056,7 +1062,7 @@ check-first-frame-is-sid: 
    expose_as: "logs-sidstart"

    expire_in: "5 days"



.lc3plus-ensure-no-code-changes:

lc3plus-ensure-no-code-changes:

  extends:

    - .test-job-linux

    - .rules-merge-request-to-main
@@ -1068,7 +1074,7 @@ check-first-frame-is-sid: 
    - ./scripts/lc3plus_lib_setup/get_lc3plus.sh



    # Ensure git reports no changes

    - modified_files=$(git status -s)

    - modified_files=$(git status -su lib_lc3plus)

    - if [[ $modified_files ]]; then printf 'LC3plus codebase was modified!\n\n'"$modified_files"'\n\n'; exit $EXIT_CODE_FAIL; fi



check-bitexactness-hrtf-rom-and-file:
@@ -1171,7 +1177,6 @@ be-2-evs-windows: 
#     - cd evs_be_test

#     - python3 ../ci/run_evs_be_test.py





# TODO: do we still need this?

# codec-comparison-on-main-push:

#   extends: