From cf211d9fdeec95b17253fee5072a4807240cea54 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 9 Oct 2024 10:27:25 +0200 Subject: [PATCH 1/7] Store logs in orphan branch report-history --- .gitlab-ci.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 714b2c1c8..a5eb209a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,7 @@ variables: LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch" + REPORT_HISTORY_BRANCH: "report-history" PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm" TESTCASE_TIMEOUT_STV: 900 TESTCASE_TIMEOUT_LTV: 2400 @@ -281,8 +282,15 @@ 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 + # Store MLD file for history in report-history branch + - git clone -b $REPORT_HISTORY_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch report-history - cp $CSV_ARTIFACT_NAME $HISTORY_ARTIFACT_NAME + - cp -r $HISTORY_ARTIFACT_NAME report-history + - cd report-history + - git add $HISTORY_ARTIFACT_NAME + - git commit -m "Added $HISTORY_ARTIFACT_NAME" + - git push + - cd .. - else # create empty file for artifacts to avoid errors - touch $PAGES_HTML_ARTIFACT_NAME @@ -316,7 +324,6 @@ stages: - $MERGED_CSV_ARTIFACT_NAME - $SUMMARY_HTML_ARTIFACT_NAME - $IMAGES_ARTIFACT_NAME - - $HISTORY_ARTIFACT_NAME expose_as: "pytest compare results" reports: junit: @@ -1331,9 +1338,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: -- GitLab From 31ba5188bc808d9471625ab3b185c9f7f0d672ad Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 9 Oct 2024 11:54:53 +0200 Subject: [PATCH 2/7] Safeguard logging section with ||true to prevent that it breaks the daily tests --- .gitlab-ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5eb209a9..4a187e844 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -282,15 +282,15 @@ 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 in report-history branch - - git clone -b $REPORT_HISTORY_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch report-history - - cp $CSV_ARTIFACT_NAME $HISTORY_ARTIFACT_NAME - - cp -r $HISTORY_ARTIFACT_NAME report-history - - cd report-history - - git add $HISTORY_ARTIFACT_NAME - - git commit -m "Added $HISTORY_ARTIFACT_NAME" - - git push - - cd .. + # Store MLD file for history in report-history branch. Safeguard with "|| true" to ensure this section does not stop the job. + - git clone -b $REPORT_HISTORY_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch report-history || true + - cp $CSV_ARTIFACT_NAME $HISTORY_ARTIFACT_NAME || true + - cp -r $HISTORY_ARTIFACT_NAME report-history || true + - cd report-history || true + - git add $HISTORY_ARTIFACT_NAME || true + - git commit -m "Added $HISTORY_ARTIFACT_NAME" || true + - git push || true + - cd .. || true - else # create empty file for artifacts to avoid errors - touch $PAGES_HTML_ARTIFACT_NAME -- GitLab From 90f9c42e34d9a75956668ff4db570d538900e28f Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 9 Oct 2024 13:11:08 +0200 Subject: [PATCH 3/7] Add dummy files to avoid warning on missing artifacts in ivas-pytest-on-merge-request-anchor --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a187e844..a0907c965 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -395,6 +395,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 -- GitLab From b410af255da3aa29bfa07f111979782776590f35 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 9 Oct 2024 14:05:45 +0200 Subject: [PATCH 4/7] Add missing PEAQ ODG from summary report --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0907c965..1bf55a6fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -375,7 +375,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 -- GitLab From c3ffc3d0d77eb0a2d30d282843beda691944a2ca Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 9 Oct 2024 14:26:22 +0200 Subject: [PATCH 5/7] Add missing ODG in ivas-pytest-anchor --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1bf55a6fc..a0f758975 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -271,7 +271,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 -- GitLab From 067c293db7aca8e272dd63553f1eb7583132aadb Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 9 Oct 2024 15:58:30 +0200 Subject: [PATCH 6/7] Clean out report logging since it does not work --- .gitlab-ci.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0f758975..ab549c463 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -255,7 +255,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 @@ -270,7 +269,6 @@ 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 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 @@ -282,15 +280,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 in report-history branch. Safeguard with "|| true" to ensure this section does not stop the job. - - git clone -b $REPORT_HISTORY_BRANCH https://forge.3gpp.org/rep/sa4/audio/ivas-basop.git --single-branch report-history || true - - cp $CSV_ARTIFACT_NAME $HISTORY_ARTIFACT_NAME || true - - cp -r $HISTORY_ARTIFACT_NAME report-history || true - - cd report-history || true - - git add $HISTORY_ARTIFACT_NAME || true - - git commit -m "Added $HISTORY_ARTIFACT_NAME" || true - - git push || true - - cd .. || true - else # create empty file for artifacts to avoid errors - touch $PAGES_HTML_ARTIFACT_NAME -- GitLab From 448c6e3c0f2fb287d03181d841f9a8f13cea4db1 Mon Sep 17 00:00:00 2001 From: Erik Norvell Date: Wed, 9 Oct 2024 16:00:20 +0200 Subject: [PATCH 7/7] Clean out unused history branch --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab549c463..169688653 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,7 +17,6 @@ variables: LEVEL_SCALING: "1.0" IVAS_PIPELINE_NAME: '' BASOP_CI_BRANCH_PC_REPO: "basop-ci-branch" - REPORT_HISTORY_BRANCH: "report-history" PRM_FILES: "scripts/config/self_test.prm scripts/config/self_test_ltv.prm" TESTCASE_TIMEOUT_STV: 900 TESTCASE_TIMEOUT_LTV: 2400 -- GitLab