[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 1/9] Avocado GitLab CI jobs: don't reset TARGETS and simplify
From: |
Daniel P . Berrangé |
Subject: |
Re: [PATCH 1/9] Avocado GitLab CI jobs: don't reset TARGETS and simplify commands |
Date: |
Mon, 28 Feb 2022 09:42:27 +0000 |
User-agent: |
Mutt/2.1.5 (2021-12-30) |
On Fri, Feb 25, 2022 at 04:01:48PM -0500, Cleber Rosa wrote:
> The Avocado tests rely on the TARGETS variable, which is computed
> based on the built targets. The current set of commands on the
> inherited scripts section will reset those, leaving TARGETS empty and
> consequently the AVOCADO_CMDLINE_TAGS empty too.
>
> This is causing the list of tests to have no filtering by tags, which
> can be seen by the large number of CANCEL/SKIP statuses (because of
> the lack of a matching qemu-system-$(ARCH) binary).
>
> With this change, the TARGETS variable is properly computed, and so is
> the AVOCADO_CMDLINE_TAGS. This causes a reduction in the number of
> tests attempted to be run on each job, and less noise on the test
> results.
This description isn't making sense to me.
AFAICT, none of the avocado-system-$DISTRO jobs in buildtest.yml
are setting the $TARGETS variable before/after this change.
>
> Signed-off-by: Cleber Rosa <crosa@redhat.com>
> ---
> .gitlab-ci.d/buildtest-template.yml | 3 +++
> .gitlab-ci.d/buildtest.yml | 9 ---------
> 2 files changed, 3 insertions(+), 9 deletions(-)
>
> diff --git a/.gitlab-ci.d/buildtest-template.yml
> b/.gitlab-ci.d/buildtest-template.yml
> index 2c7980a4f6..c038a0910f 100644
> --- a/.gitlab-ci.d/buildtest-template.yml
> +++ b/.gitlab-ci.d/buildtest-template.yml
> @@ -64,6 +64,9 @@
> du -chs ${CI_PROJECT_DIR}/avocado-cache ;
> fi
> - export AVOCADO_ALLOW_UNTRUSTED_CODE=1
> + script:
> + - cd build
> + - make check-avocado
The parent template has a 'script:' block we currently inherit
- scripts/git-submodule.sh update
$(sed -n '/GIT_SUBMODULES=/ s/.*=// p' build/config-host.mak)
- cd build
- find . -type f -exec touch {} +
# Avoid recompiling by hiding ninja with NINJA=":"
- make NINJA=":" $MAKE_CHECK_ARGS
so replacing this is loosing the potential git submodule update
and looses the protection against recompilation.
I'm not seeing what in this old inherited is breaking the $TARGETS
variable, not least because it was never set before/after AFAICT.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
- [PATCH 0/9] Avocado tests: filter out tests using TCG booting full blown distros, Cleber Rosa, 2022/02/25
- [PATCH 1/9] Avocado GitLab CI jobs: don't reset TARGETS and simplify commands, Cleber Rosa, 2022/02/25
- Re: [PATCH 1/9] Avocado GitLab CI jobs: don't reset TARGETS and simplify commands,
Daniel P . Berrangé <=
- [PATCH 2/9] Avocado tests: use logging namespace that is preserved in test logs, Cleber Rosa, 2022/02/25
- [PATCH 3/9] Avocado migration test: adapt to "utils.network" API namespace change, Cleber Rosa, 2022/02/25
- [PATCH 4/9] Avocado: bump to version 95.0, Cleber Rosa, 2022/02/25
- [PATCH 5/9] tests/avocado/linux_ssh_mips_malta.py: add missing accel (tcg) tag, Cleber Rosa, 2022/02/25