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

update renderer and split rendering jobs

parent fc0058b7

.gitlab-ci.yml

+5 −19
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ stages: 
  - make -j

  - mv IVAS_cod ../IVAS_cod_test

  - mv IVAS_dec ../IVAS_dec_test

  - mv IVAS_rend ..

  - mv IVAS_rend ../IVAS_rend_test

  - cd ..

  - rm -rf build/*
@@ -129,11 +129,13 @@ stages: 
  - make -j

  - mv IVAS_cod ../IVAS_cod_ref

  - mv IVAS_dec ../IVAS_dec_ref

  - mv IVAS_rend ../IVAS_rend_ref

  - cd ..



  # rename test binaries back

  - mv IVAS_cod_test IVAS_cod

  - mv IVAS_dec_test IVAS_dec

  - mv IVAS_rend_test IVAS_rend



.merge-request-comparison-check: &merge-request-comparison-check

  - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi
@@ -618,6 +620,7 @@ renderer-pytest-on-merge-request: 
    - *print-common-info

    - *get-commits-behind-count

    - *check-commits-behind-count-in-compare-jobs

    - *merge-request-comparison-setup-codec



    # some helper variables - "|| true" to prevent failures from grep not finding anything

    # write to temporary file as workaround for failures observed with piping echo
@@ -625,32 +628,16 @@ renderer-pytest-on-merge-request: 
    - non_be_flag=$(grep -c --ignore-case "\[rend\(erer\)*[ -]*non[ -]*be\]" tmp.txt) || true

    - ref_using_main=$(grep -c --ignore-case "\[ref[ -]*using[ -]*main\]" tmp.txt) || true



    # store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)



    - *mr-fetch-target-branch

    - *mr-get-target-commit

    - git checkout $target_commit



    # build reference binaries

    - make -j IVAS_rend

    - mv IVAS_rend IVAS_rend_ref



    ### If ref_using_main is not set, checkout the source branch to use scripts and input from there

    - if [ $ref_using_main == 0 ]; then git checkout $source_branch_commit_sha; fi



    - exit_code=0

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer.py --create_ref || exit_code=$?



    # back to source branch

    - git checkout $source_branch_commit_sha

    - make clean

    - make -j IVAS_rend



    ### Run test using branch scripts and input

    - if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi



    # run test

    - exit_code=0

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/renderer/test_renderer_.py --create_cut || exit_code=$?

    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true
@@ -745,7 +732,6 @@ split-rendering-pytest-on-merge-request: 
    - if [ $ref_using_main == 1 ]; then git checkout $source_branch_commit_sha; fi



    # run test

    - exit_code=0

    - python3 -m pytest -q --log-level ERROR -n auto -rA --html=report.html --self-contained-html --junit-xml=report-junit.xml tests/split_rendering/test_split_rendering.py --create_cut || exit_code=$?

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