diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 00bfd1ae833e3f1948ca36664c212c51166d40ce..d025e6d449d5d5aeb0b97f1c3bf8d19a73d6bcc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -250,11 +250,11 @@ 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--ivas-pytest-mld-long-dec-$id_previous--sha-*.csv" - - python3 ci/basop-pages/create_report_pages.py $CI_JOB_NAME-index.html $CI_JOB_NAME--merged_csv--$CI_JOB_ID--$id_previous.csv $MLD_ARTIFACT_NAME $file_previous $CI_JOB_ID $id_previous $CI_JOB_NAME + - python3 ci/basop-pages/create_report_pages.py $CI_JOB_NAME-index.html $CI_JOB_NAME--merged_csv--$CI_JOB_ID.csv $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 $CI_JOB_NAME--merged_csv--$CI_JOB_ID--$id_previous.csv + - touch $CI_JOB_NAME--merged_csv--$CI_JOB_ID.csv - fi - if [ $zero_errors != 1 ]; then echo "Run errors encountered!"; exit $EXIT_CODE_FAIL; fi @@ -273,7 +273,8 @@ stages: - report.html - $CI_JOB_NAME-index.html - $MLD_ARTIFACT_NAME - - $CI_JOB_NAME-merged_csv--$CI_JOB_ID--$id_previous.csv + # the * wildcard is needed because $id_previous is undefined here + - $CI_JOB_NAME-merged_csv--$CI_JOB_ID.csv expose_as: "pytest mld results" reports: junit: