Re: [PATCH 17/18] gitlab: wrap up test results for custom runners

[Thomas Huth]

On 19/01/2023 19.04, Alex Bennée wrote:
> Instead of spewing the whole log to stdout lets just define them as
> build artefacts so we can examine them later. Where we are running
> check-tcg run it first as those tests are yet to be integrated into
> meson.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   .gitlab-ci.d/custom-runners.yml                     | 11 +++++++++++
>   .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml  | 13 ++++++-------
>   .../custom-runners/ubuntu-22.04-aarch32.yml         |  2 +-
>   .../custom-runners/ubuntu-22.04-aarch64.yml         | 13 ++++++-------
>   4 files changed, 24 insertions(+), 15 deletions(-)
>
> diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
> index 97f99e29c2..9fdc476c48 100644
> --- a/.gitlab-ci.d/custom-runners.yml
> +++ b/.gitlab-ci.d/custom-runners.yml
> @@ -13,6 +13,17 @@
>   variables:
>     GIT_STRATEGY: clone
>   
> +# All custom runners can extend this template to upload the testlog
> +# data as an artifact and also feed the junit report
> +.custom_artifacts_template:
> +  artifacts:
> +    name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
> +    expire_in: 7 days
> +    paths:
> +      - build/meson-logs/testlog.txt
> +    reports:
> +      junit: build/meson-logs/testlog.junit.xml
> +
>   include:
>     - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml'
>     - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml'
> diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml 
> b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> index fcaef9e5ef..f512eaeaa3 100644
> --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml
> @@ -3,6 +3,7 @@
>   # "Install basic packages to build QEMU on Ubuntu 20.04/20.04"
>   
>   ubuntu-20.04-s390x-all-linux-static:
> + extends: .custom_artifacts_template
>    needs: []
>    stage: build
>    tags:
> @@ -19,12 +20,11 @@ ubuntu-20.04-s390x-all-linux-static:
>    - ../configure --enable-debug --static --disable-system --disable-glusterfs 
> --disable-libssh
>      || { cat config.log meson-logs/meson-log.txt; exit 1; }
>    - make --output-sync -j`nproc`
> + - make --output-sync check-tcg
>    - make --output-sync -j`nproc` check
> -   || { cat meson-logs/testlog.txt; exit 1; } ;
> - - make --output-sync -j`nproc` check-tcg
> -   || { cat meson-logs/testlog.txt; exit 1; } ;

No more -j`nproc` for check-tcg? Maybe mention the reason in the commit message?

Anyway,
Reviewed-by: Thomas Huth <thuth@redhat.com>