Commit fcdaf9b1 authored by Fabian Müller's avatar Fabian Müller
Browse files

Change ref_using_main to ref_using_target

parent 2d7d9a50

.gitlab-ci.yml

+8 −6
Original line number Diff line number Diff line
@@ -780,7 +780,9 @@ split-rendering-pytest-on-merge-request: 
    # write to temporary file as workaround for failures observed with piping echo

    - echo $CI_MERGE_REQUEST_TITLE > tmp.txt

    - non_be_flag=$(grep -c --ignore-case "\[split*[ -]*non[ -]*be\]" tmp.txt) || true

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

    - # TODO: ref_using_target comes from float repo, but does not apply here - disable for now

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

    - ref_using_target=0



    # store the current commit hash

    - source_branch_commit_sha=$(git rev-parse HEAD)
@@ -796,9 +798,9 @@ split-rendering-pytest-on-merge-request: 
    - mv IVAS_dec IVAS_dec_ref

    - 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 restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts

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

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

    - if [ $ref_using_target == 0 ]; then git restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts

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

    - exit_code=0

    - testcase_timeout=60

    - 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_ref --testcase_timeout=$testcase_timeout || exit_code=$?
@@ -810,8 +812,8 @@ split-rendering-pytest-on-merge-request: 
    - make -j



    ### Run test using scripts and input from main

    - if [ $ref_using_main == 1 ]; then git restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts

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

    - if [ $ref_using_target == 1 ]; then git restore lib_com/options.h; fi # Revert changes back before checking out another branch to avoid conflicts

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



    # run test

    - 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 --testcase_timeout=$testcase_timeout || exit_code=$?