Commit e2806f2a authored by norvell's avatar norvell
Browse files

Merge branch 'ci/fix-summary' into 'main' 

[CI] Updated pages to synch with !1675 in PC repo

See merge request !435
parents 0fe24b10 8d587bd3

.gitlab-ci.yml

+9 −6
Original line number Diff line number Diff line
@@ -215,6 +215,8 @@ stages: 
    MLD_ARTIFACT_NAME: "mld--$CI_JOB_NAME-$CI_JOB_ID--sha-$CI_COMMIT_SHORT_SHA.csv"

    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"

    IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME"

  script:

    - *print-common-info

    - *update-scripts-repo
@@ -237,10 +239,9 @@ stages: 
    - zero_errors=$(cat report-junit.xml | grep -c 'errors="0"') || true



    - python3 scripts/parse_xml_report.py report-junit.xml $MLD_ARTIFACT_NAME

    - mkdir images

    - python3 scripts/create_histogram_summary.py $MLD_ARTIFACT_NAME images/summary_"$CI_JOB_ID"_MLD.csv images/summary_"$CI_JOB_ID"_MLD.png --measure MLD

    - python3 scripts/create_histogram_summary.py $MLD_ARTIFACT_NAME images/summary_"$CI_JOB_ID"_DIFF.csv images/summary_"$CI_JOB_ID"_DIFF.png --measure DIFF

    - python3 scripts/create_histogram_summary.py $MLD_ARTIFACT_NAME images/summary_"$CI_JOB_ID"_SSNR.csv images/summary_"$CI_JOB_ID"_SSNR.png --measure SSNR

    - mkdir $IMAGES_ARTIFACT_NAME

    - for MEASURE in MLD DIFF SSNR;do python3 scripts/create_histogram_summary.py $MLD_ARTIFACT_NAME images_"$CI_JOB_NAME"/summary_"$MEASURE".csv images_"$CI_JOB_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



    - 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)
@@ -249,10 +250,10 @@ stages: 
    -    unzip artifacts.zip -d previous_artifacts

    # This wildcard thingy relies on only one csv file being present per job

    -    file_previous="previous_artifacts/mld--$CI_JOB_NAME-$id_previous--sha-*.csv"

    -    python3 ci/basop-pages/create_report_pages.py $PAGES_HTML_ARTIFACT_NAME $MERGED_CSV_ARTIFACT_NAME $MLD_ARTIFACT_NAME $file_previous $CI_JOB_ID $id_previous $CI_JOB_NAME --histogram

    -    python3 ci/basop-pages/create_report_pages.py $PAGES_HTML_ARTIFACT_NAME $MERGED_CSV_ARTIFACT_NAME $MLD_ARTIFACT_NAME $file_previous $CI_JOB_ID $id_previous $CI_JOB_NAME

    - else

    # create empty file for artifacts to avoid errors

    -    touch $CI_JOB_NAME-index.html

    -    touch $PAGES_HTML_ARTIFACT_NAME

    -    touch $MERGED_CSV_ARTIFACT_NAME

    - fi
@@ -274,6 +275,8 @@ stages: 
      - $MLD_ARTIFACT_NAME

      - $MERGED_CSV_ARTIFACT_NAME

      - images

      - $SUMMARY_HTML_ARTIFACT_NAME

      - $IMAGES_ARTIFACT_NAME

    expose_as: "pytest mld results"

    reports:

      junit: