Daniel P. Berrangé <berra...@redhat.com> writes:
> The build jobs will populate build/meson-logs/ with various files
> that are added as artifacts.
>
> The test jobs preserve the state of the build jobs, so we must
> delete any pre-existing logs to prevent confusion from duplicate
> artifacts.
Will this cause us to rebuild needlessly?
>
> Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
> ---
> .gitlab-ci.d/buildtest-template.yml | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/.gitlab-ci.d/buildtest-template.yml
> b/.gitlab-ci.d/buildtest-template.yml
> index 308490a35a..d866cb12bb 100644
> --- a/.gitlab-ci.d/buildtest-template.yml
> +++ b/.gitlab-ci.d/buildtest-template.yml
> @@ -83,6 +83,10 @@
>
> .native_test_job_template:
> extends: .common_test_job_template
> + before_script:
> + # Prevent logs from the build job that run earlier
> + # from being duplicated in the test job artifacts
> + - rm -f build/meson-logs/*
> artifacts:
> name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
> when: always
> @@ -111,6 +115,9 @@
> before_script:
> - export QEMU_TEST_ALLOW_UNTRUSTED_CODE=1
> - export QEMU_TEST_CACHE_DIR=${CI_PROJECT_DIR}/functional-cache
> + # Prevent logs from the build job that run earlier
> + # from being duplicated in the test job artifacts
> + - rm -f build/meson-logs/*
> after_script:
> - cd build
> - du -chs ${CI_PROJECT_DIR}/*-cache
--
Alex Bennée
Virtualisation Tech Lead @ Linaro
