diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 714b2c1c85b791c9509cb474e6def6e3a7158afa..169688653db957435c33dc0a312cce69ed869b74 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -254,7 +254,6 @@ 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 @@ -269,8 +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 + - for MEASURE in MLD DIFF SSNR ODG;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 - if [ $USE_LTV -eq 1 ] && [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]; then @@ -281,8 +279,6 @@ 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 @@ -316,7 +312,6 @@ stages: - $MERGED_CSV_ARTIFACT_NAME - $SUMMARY_HTML_ARTIFACT_NAME - $IMAGES_ARTIFACT_NAME - - $HISTORY_ARTIFACT_NAME expose_as: "pytest compare results" reports: junit: @@ -368,7 +363,7 @@ stages: # create the summary based on the branch - mkdir $IMAGES_ARTIFACT_NAME - - for MEASURE in MLD DIFF SSNR;do python3 scripts/create_histogram_summary.py $CSV_BRANCH $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".csv $IMAGES_ARTIFACT_NAME/summary_"$MEASURE".png --measure $MEASURE; done + - for MEASURE in MLD DIFF SSNR ODG;do python3 scripts/create_histogram_summary.py $CSV_BRANCH $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 ### run main now @@ -388,6 +383,12 @@ stages: - diff $CSV_BRANCH $CSV_MAIN || diff_report=$? - if [ $diff_param -eq 0 ] && [ $diff_sba -eq 0 ] && [ $diff_report -eq 0 ] && [ $zero_errors_branch -eq 1 ]; then - echo "Output BE to main, identical report and no run errors encountered." + # Add dummy files to avoid warning on missing artifacts + - touch changes_crashes.csv + - touch changes_MLD.csv + - touch changes_MAXIMUM_ABS_DIFF.csv + - touch changes_MIN_SSNR.csv + - touch changes_MIN_ODG.csv - exit 0; - fi @@ -1331,9 +1332,6 @@ pages: - *print-common-info - *update-scripts-repo - python3 ci/setup_pages.py - # Copy logs - - mkdir -p public/history - - if [ -e daily_results_* ]; then cp -r daily_results_* public/history; fi - ls - ls public artifacts: