From fcf16cc9ac984eca990f615a29046bf030b7eeef Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Sat, 7 Sep 2024 19:40:04 +0200 Subject: [PATCH 1/4] store mld files from daily jobs on gitlab pages --- .gitlab-ci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e1746bcc..1b7f33f27 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -243,6 +243,7 @@ stages: 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" + HISTORY_ARTIFACT_NAME: "daily_results_$(date +%Y-%m-%d)" script: - *print-common-info - *update-scripts-repo @@ -267,6 +268,7 @@ stages: - python3 scripts/parse_xml_report.py report-junit.xml $CSV_ARTIFACT_NAME - mkdir $IMAGES_ARTIFACT_NAME + - mkdir $HISTORY_ARTIFACT_NAME - for MEASURE in MLD DIFF SSNR;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 @@ -278,6 +280,8 @@ stages: # 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 $CSV_ARTIFACT_NAME $file_previous $CI_JOB_ID $id_previous $CI_JOB_NAME + # Store MLD file for history, such that pages job will only pick these if found in this folder + - cp $CSV_ARTIFACT_NAME $HISTORY_ARTIFACT_NAME - else # create empty file for artifacts to avoid errors - touch $PAGES_HTML_ARTIFACT_NAME @@ -311,6 +315,7 @@ stages: - $MERGED_CSV_ARTIFACT_NAME - $SUMMARY_HTML_ARTIFACT_NAME - $IMAGES_ARTIFACT_NAME + - $HISTORY_ARTIFACT_NAME expose_as: "pytest compare results" reports: junit: @@ -1188,6 +1193,13 @@ complexity-stereo-in-stereo-out: # job that sets up gitlab pages website pages: stage: deploy + dependencies: + - ivas-pytest-compare_ref-long-enc + - ivas-pytest-compare_ref-long-enc-lev+10 + - ivas-pytest-compare_ref-long-enc-lev-10 + - ivas-pytest-compare_ref-long-dec + - ivas-pytest-compare_ref-long-dec-lev+10 + - ivas-pytest-compare_ref-long-dec-lev-10 tags: - ivas-basop-linux rules: @@ -1196,6 +1208,9 @@ pages: - *print-common-info - *update-scripts-repo - python3 ci/setup_pages.py + # Copy logs + - mkdir -p public/history + - cp -r daily_results_* public/history - ls - ls public artifacts: -- GitLab From 94ec454da54c14c6960ce94dcfb1ddadd5b97e51 Mon Sep 17 00:00:00 2001 From: norvell Date: Sun, 8 Sep 2024 05:53:49 +0000 Subject: [PATCH 2/4] Remove dependencies from pages job --- .gitlab-ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b7f33f27..c58bb02b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -518,7 +518,7 @@ build-codec-linux-make: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main - - if: $CI_PIPELINE_SOURCE == 'schedule' + - if: $CI_PIPE li LINE_SOURCE == 'schedule' - if: $CI_PIPELINE_SOURCE == 'push' when: never extends: @@ -1193,13 +1193,6 @@ complexity-stereo-in-stereo-out: # job that sets up gitlab pages website pages: stage: deploy - dependencies: - - ivas-pytest-compare_ref-long-enc - - ivas-pytest-compare_ref-long-enc-lev+10 - - ivas-pytest-compare_ref-long-enc-lev-10 - - ivas-pytest-compare_ref-long-dec - - ivas-pytest-compare_ref-long-dec-lev+10 - - ivas-pytest-compare_ref-long-dec-lev-10 tags: - ivas-basop-linux rules: -- GitLab From 69a16dfba46c9ae1d726f32d7222493f46dc847b Mon Sep 17 00:00:00 2001 From: norvell Date: Sun, 8 Sep 2024 06:01:27 +0000 Subject: [PATCH 3/4] Fix accidental syntax error --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c58bb02b3..1ca4dd03f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -518,7 +518,7 @@ build-codec-linux-make: - if: $CI_PIPELINE_SOURCE == 'web' - if: $CI_PIPELINE_SOURCE == 'push' && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "main" # only have MR pipelines for MRs to main - - if: $CI_PIPE li LINE_SOURCE == 'schedule' + - if: $CI_PIPELINE_SOURCE == 'schedule' - if: $CI_PIPELINE_SOURCE == 'push' when: never extends: -- GitLab From 1398a2b466fcf47e6ed8832f39b9dcd09130354b Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 18 Sep 2024 06:42:21 +0200 Subject: [PATCH 4/4] Move HISTORY_ARTIFACT_NAME to step script to evaluate date expression --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ca4dd03f..9dd0462a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -243,7 +243,6 @@ stages: 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" - HISTORY_ARTIFACT_NAME: "daily_results_$(date +%Y-%m-%d)" script: - *print-common-info - *update-scripts-repo @@ -254,6 +253,7 @@ stages: - else - testcase_timeout=$TESTCASE_TIMEOUT_STV - fi + - HISTORY_ARTIFACT_NAME="daily_results_$(date +%Y-%m-%d)" - python3 ci/remove_unsupported_testcases.py $PRM_FILES - if [ $LEVEL_SCALING != "1.0" ];then -- GitLab