Re: [PATCH] gitlab-ci.yml: Merge the trace-backend testing into other jobs

[Wainer dos Santos Moschetta]

Hi,

On 3/19/21 6:57 AM, Thomas Huth wrote:
> Our gitlab-ci got quite slow in the past weeks, due to the immense amount
> of jobs that we have, so we should try to reduce the number of jobs.
> There is no real good reason for having separate jobs just to test the
> trace backends, we can do this just fine in other jobs, too.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   .gitlab-ci.yml | 30 +++---------------------------
>   1 file changed, 3 insertions(+), 27 deletions(-)
>
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 0cc6d53f7e..cbbd67f139 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -87,7 +87,7 @@ build-system-alpine:
>       TARGETS: aarch64-softmmu alpha-softmmu cris-softmmu hppa-softmmu
>         moxie-softmmu microblazeel-softmmu mips64el-softmmu
>       MAKE_CHECK_ARGS: check-build
> -    CONFIGURE_ARGS: --enable-docs
> +    CONFIGURE_ARGS: --enable-docs --enable-trace-backends=log,simple,syslog
>     artifacts:
>       expire_in: 2 days
>       paths:
> @@ -608,7 +608,7 @@ tsan-build:
>     variables:
>       IMAGE: ubuntu2004
>       CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 
> --disable-docs
> -                    --enable-fdt=system --enable-slirp=system
> +          --enable-trace-backends=ust --enable-fdt=system --enable-slirp=system
>       TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user
>       MAKE_CHECK_ARGS: bench V=1
>   
> @@ -706,6 +706,7 @@ build-coroutine-sigaltstack:
>     variables:
>       IMAGE: ubuntu2004
>       CONFIGURE_ARGS: --with-coroutine=sigaltstack --disable-tcg
> +                    --enable-trace-backends=ftrace

Nit: different indentation from the previous CONFIGURE_ARGS

Regardless,

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>


>       MAKE_CHECK_ARGS: check-unit
>   
>   # Most jobs test latest gcrypt or nettle builds
> @@ -743,31 +744,6 @@ crypto-only-gnutls:
>       MAKE_CHECK_ARGS: check
>   
>   
> -# We don't need to exercise every backend with every front-end
> -build-trace-multi-user:
> -  <<: *native_build_job_definition
> -  needs:
> -    job: amd64-ubuntu2004-container
> -  variables:
> -    IMAGE: ubuntu2004
> -    CONFIGURE_ARGS: --enable-trace-backends=log,simple,syslog --disable-system
> -
> -build-trace-ftrace-system:
> -  <<: *native_build_job_definition
> -  needs:
> -    job: amd64-ubuntu2004-container
> -  variables:
> -    IMAGE: ubuntu2004
> -    CONFIGURE_ARGS: --enable-trace-backends=ftrace --target-list=x86_64-softmmu
> -
> -build-trace-ust-system:
> -  <<: *native_build_job_definition
> -  needs:
> -    job: amd64-ubuntu2004-container
> -  variables:
> -    IMAGE: ubuntu2004
> -    CONFIGURE_ARGS: --enable-trace-backends=ust --target-list=x86_64-softmmu
> -
>   # Check our reduced build configurations
>   build-without-default-devices:
>     <<: *native_build_job_definition