From 3d3f635ecdaaf90f01880b40856b79458bfac0f3 Mon Sep 17 00:00:00 2001 From: norvell Date: Fri, 5 Jul 2024 07:47:18 +0000 Subject: [PATCH 1/3] Updated pages to synch with !1675 in PC repo --- .gitlab-ci.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e882417fd..a8fd344f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -237,10 +237,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_"$CI_JOB_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_$CI_JOB_NAME.html $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 +248,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 -- GitLab From acd76a6cb52afdd35fdf3e49b0e34bfd1053d2bd Mon Sep 17 00:00:00 2001 From: norvell Date: Fri, 5 Jul 2024 09:57:40 +0000 Subject: [PATCH 2/3] Added missing artifact $SUMMARY_HTML_ARTIFACT_NAME --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8fd344f5..e137f89bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -215,6 +215,7 @@ 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" script: - *print-common-info - *update-scripts-repo @@ -239,7 +240,7 @@ stages: - python3 scripts/parse_xml_report.py report-junit.xml $MLD_ARTIFACT_NAME - mkdir images_"$CI_JOB_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_$CI_JOB_NAME.html $CI_JOB_ID $CI_JOB_NAME + - 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) @@ -273,6 +274,7 @@ stages: - $MLD_ARTIFACT_NAME - $MERGED_CSV_ARTIFACT_NAME - images + - $SUMMARY_HTML_ARTIFACT_NAME expose_as: "pytest mld results" reports: junit: -- GitLab From 8d587bd32536f165a2e89193122f9155d45547bf Mon Sep 17 00:00:00 2001 From: norvell Date: Fri, 5 Jul 2024 10:01:53 +0000 Subject: [PATCH 3/3] Another missing artifact $IMAGES_ARTIFACT_NAME --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e137f89bc..b4d7b432a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,6 +216,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" + IMAGES_ARTIFACT_NAME: "images_$CI_JOB_NAME" script: - *print-common-info - *update-scripts-repo @@ -238,7 +239,7 @@ 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_"$CI_JOB_NAME" + - 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 @@ -275,6 +276,7 @@ stages: - $MERGED_CSV_ARTIFACT_NAME - images - $SUMMARY_HTML_ARTIFACT_NAME + - $IMAGES_ARTIFACT_NAME expose_as: "pytest mld results" reports: junit: -- GitLab