Loading .gitlab-ci.yml +9 −5 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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 Loading Loading @@ -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: Loading Loading @@ -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: Loading Loading
.gitlab-ci.yml +9 −5 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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 Loading Loading @@ -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: Loading Loading @@ -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: Loading