Commit 50d0ae3f authored by Jan Kiene's avatar Jan Kiene
Browse files

adapt CI config to new versions of scripts

parent e96e5d70
Loading
Loading
Loading
Loading
+13 −22
Original line number Diff line number Diff line
@@ -373,6 +373,7 @@ stages:
    MERGED_CSV_ARTIFACT_NAME: "$CI_JOB_NAME--merged_csv--$CI_JOB_ID.csv"
    PAGES_HTML_ARTIFACT_NAME: "$CI_JOB_NAME-index.html"
    SUMMARY_HTML_ARTIFACT_NAME: "summary_$CI_JOB_NAME.html"
    SUMMARY_HTML_ARTIFACT_SPLIT: "summary_split_$CI_JOB_NAME.html"
    IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"
    IMAGES_ARTIFACT_SPLIT: "images_split_$CI_JOB_NAME"
  script:
@@ -398,10 +399,9 @@ stages:

    - comp_args="--mld --ssnr --odg"

    - summary_args="MLD DIFF SSNR ODG"
    - REPORT_ARG=""
    - MEASURES_FOR_REPORT="MLD MAX_ABS_DIFF MIN_SSNR MIN_ODG"
    - if [ "$ENCODER_TEST" = "true" ]; then comp_args="${comp_args} --enc_stats"; fi
    - if [ "$DELTA_ODG" = "true" ]; then comp_args="${comp_args} --odg_bin"; summary_args="${summary_args} DELTA_ODG"; REPORT_ARG="--delta_odg"; fi
    - if [ "$DELTA_ODG" = "true" ]; then comp_args="${comp_args} --odg_bin"; MEASURES_FOR_REPORT="$MEASURES_FOR_REPORT DELTA_ODG"; fi
    - if [ "$SPLIT_COMPARISON" = "true" ]; then comp_args="${comp_args} --split-comparison"; export PYTEST_ADDOPTS="-k \"not JBM and stereo and at\""; fi

    - *build-and-create-float-ref-outputs
@@ -419,30 +419,20 @@ stages:
    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true

    ### create histograms
    - python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME $REPORT_ARG
    # if split comparison is done, we need to create two pages, one for the "whole file" values and one for the "split" values
    - python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME --split-csv-file $CSV_ARTIFACT_SPLIT

    # first for "whole" files comparison
    - python3 scripts/create_histograms.py $CSV_ARTIFACT_NAME $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

    - if [ "$SPLIT_COMPARISON" = "true" ]; then
    # use -v flag ("inverse") to also have the header in the output file
    - grep -v "_whole" $CSV_ARTIFACT_NAME > $CSV_ARTIFACT_SPLIT
    - cp $CSV_ARTIFACT_NAME tmp.csv
    - grep -v "_split" tmp.csv > $CSV_ARTIFACT_NAME
    - mkdir $IMAGES_ARTIFACT_SPLIT
    - for MEASURE in $summary_args;do
    - python3 scripts/create_histogram_summary.py $CSV_ARTIFACT_SPLIT $IMAGES_ARTIFACT_SPLIT/summary_"$MEASURE".csv $IMAGES_ARTIFACT_SPLIT/summary_"$MEASURE".png --measure $MEASURE
    - done
    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_SPLIT --measures $summary_args
    -   python3 scripts/create_histograms.py $CSV_ARTIFACT_SPLIT $IMAGES_ARTIFACT_SPLIT --measures $MEASURES_FOR_REPORT
    -   python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_SPLIT $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_SPLIT --measures $MEASURES_FOR_REPORT
    - else
    # touch files to suppress warning for missing artifacts
    -   touch $CSV_ARTIFACT_SPLIT $IMAGES_ARTIFACT_SPLIT
    - fi

    # this part creates the "whole file" histograms
    - mkdir $IMAGES_ARTIFACT_NAME
    - for MEASURE in $summary_args;do
    - python3 scripts/create_histogram_summary.py $CSV_ARTIFACT_NAME $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE;
    - done
    - python3 ci/basop-pages/create_summary_page.py $SUMMARY_HTML_ARTIFACT_NAME $CI_JOB_ID $CI_JOB_NAME $IMAGES_ARTIFACT_NAME --measures $summary_args

    - if [ $USE_LTV -eq 1 ] && [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then
    - id_previous=$(python3 ci/get_id_of_last_job_occurence.py $CI_DEFAULT_BRANCH $CI_JOB_NAME $CI_PROJECT_ID)
    - echo "Job ID from variables - $CI_JOB_ID, Job ID from script - $id_previous"
@@ -484,6 +474,7 @@ stages:
      - $CSV_ARTIFACT_SPLIT
      - $MERGED_CSV_ARTIFACT_NAME
      - $SUMMARY_HTML_ARTIFACT_NAME
      - $SUMMARY_HTML_ARTIFACT_SPLIT
      - $IMAGES_ARTIFACT_NAME
      - $IMAGES_ARTIFACT_SPLIT
    expose_as: "pytest compare results"