Commit 2f0f4976 authored by Jan Kiene's avatar Jan Kiene
Browse files

convert overwrite-pytest-cache-with-artifact into script

parent 40f88a08

main-basop.yml

+4 −10
Original line number Diff line number Diff line
@@ -482,12 +482,6 @@ workflow: 
        - $XML_REPORT

        - $XML_REPORT



.overwrite-pytest-cache-with-artifact: &overwrite-pytest-cache-with-artifact

  - if [ -f $PYTEST_CACHE_ARTIFACT ]; then

  -   rm -rf .pytest_cache || true

  -   unzip $PYTEST_CACHE_ARTIFACT

  - fi



.check-regressions-pytest-job:

  extends:

    - .check-be-job
@@ -512,7 +506,7 @@ workflow: 
    - set -euxo pipefail



    - if [ -s $FAILED_TESTCASES_LIST ]; then

    -   *overwrite-pytest-cache-with-artifact

    -   bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/overwrite-pytest-cache-with-artifact.sh

    -   export PYTEST_ADDOPTS=--last-failed

    - else

    # turn off echoing back of commands for result printout
@@ -565,7 +559,7 @@ workflow: 
    ### ----- run pytest for branch (dut) first -----

    # create float reference outputs with corresponding branch

    - python3 -m pytest $TEST_SUITE -k "not model" -v --update_ref 1 $enc_stats_arg $enc_dmx_arg --create_ref -n auto --ref_encoder_path $MERGE_SOURCE_FLOAT_REF_ENCODER_PATH --ref_decoder_path $MERGE_SOURCE_FLOAT_REF_DECODER_PATH || exit_code=$?

    - *overwrite-pytest-cache-with-artifact

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/overwrite-pytest-cache-with-artifact.sh

    # create dut outputs

    - python3 -m pytest --tb=no -q $TEST_SUITE -k "not model" -v --keep_files --create_cut --html=$HTML_REPORT_BRANCH --self-contained-html --junit-xml=$XML_REPORT_BRANCH $comp_args --dut_encoder_path $DUT_ENCODER_PATH --dut_decoder_path $DUT_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true

    - zero_errors_branch=$(cat $XML_REPORT_BRANCH | grep -c 'errors="0"') || true
@@ -575,12 +569,12 @@ workflow: 
    # create the summary based on the branch only

    - python3 scripts/create_histograms.py $CSV_BRANCH $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT

    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_NAME --measures $MEASURES_FOR_REPORT

    - *overwrite-pytest-cache-with-artifact

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/overwrite-pytest-cache-with-artifact.sh



    ### ----- run pytest for merge target now -----

    # create float reference outputs with corresponding branch

    - python3 -m pytest $TEST_SUITE -k "not model" -v --update_ref 1 $enc_stats_arg $enc_dmx_arg --create_ref -n auto --ref_encoder_path $REF_ENCODER_PATH --ref_decoder_path $REF_DECODER_PATH || exit_code=$?

    - *overwrite-pytest-cache-with-artifact

    - bash "${CI_PROJECT_DIR}"/ivas-codec-ci/snippets/basop/overwrite-pytest-cache-with-artifact.sh

    # create merge-target outputs

    - python3 -m pytest --tb=no -q $TEST_SUITE -k "not model" -v --keep_files --create_cut --html=$HTML_REPORT_MAIN --self-contained-html --junit-xml=$XML_REPORT_MAIN $comp_args --dut_encoder_path $MERGE_TARGET_ENCODER_PATH --dut_decoder_path $MERGE_TARGET_DECODER_PATH -n auto --testcase_timeout $testcase_timeout || true

    - python3 scripts/parse_xml_report.py $XML_REPORT_MAIN $CSV_MAIN

snippets/basop/overwrite-pytest-cache-with-artifact.sh

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#! /bin/bash



set -euxo pipefail



cd "${CI_PROJECT_DIR}"



if [ -f $PYTEST_CACHE_ARTIFACT ]; then

  rm -rf .pytest_cache || true

  unzip $PYTEST_CACHE_ARTIFACT

fi