[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 11/14] Acceptance Tests: restore downloading of VM images
From: |
Thomas Huth |
Subject: |
[PULL 11/14] Acceptance Tests: restore downloading of VM images |
Date: |
Tue, 9 Mar 2021 11:46:14 +0100 |
From: Cleber Rosa <crosa@redhat.com>
The "get-vm-images" target defined in tests/Makefile.include is a
prerequisite for "check-acceptance", so that those files get
downloaded before the Avocado job even starts.
It looks like on c401c058a1c a TARGETS variable was introduced with a
different content than it was previously coming from the main
Makefile. From that point on, the "get-vm-images" succeed without
doing anything because there was no matching architecture to download.
This restores the download of images (that match targets to be built)
before the job starts, eliminating downloads and their associated
failures during the tests.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210225232122.1254879-2-crosa@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/Makefile.include | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index d34254fb29..dbd53a9de6 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -109,7 +109,8 @@ $(TESTS_RESULTS_DIR):
check-venv: $(TESTS_VENV_DIR)
-FEDORA_31_ARCHES_CANDIDATES=$(patsubst ppc64,ppc64le,$(TARGETS))
+FEDORA_31_ARCHES_TARGETS=$(patsubst %-softmmu,%, $(filter
%-softmmu,$(TARGETS)))
+FEDORA_31_ARCHES_CANDIDATES=$(patsubst
ppc64,ppc64le,$(FEDORA_31_ARCHES_TARGETS))
FEDORA_31_ARCHES := x86_64 aarch64 ppc64le s390x
FEDORA_31_DOWNLOAD=$(filter $(FEDORA_31_ARCHES),$(FEDORA_31_ARCHES_CANDIDATES))
--
2.27.0
- [PULL 02/14] docker: Alpine build job depends on Alpine container, (continued)
- [PULL 02/14] docker: Alpine build job depends on Alpine container, Thomas Huth, 2021/03/09
- [PULL 03/14] docker: EDK2 build job depends on EDK2 container, Thomas Huth, 2021/03/09
- [PULL 01/14] qtest: delete superfluous inclusions of qtest.h, Thomas Huth, 2021/03/09
- [PULL 04/14] docker: OpenSBI build job depends on OpenSBI container, Thomas Huth, 2021/03/09
- [PULL 05/14] meson: Re-enable the possibility to run "make check SPEED=slow", Thomas Huth, 2021/03/09
- [PULL 06/14] scripts/ci/gitlab-pipeline-status: split utlity function for HTTP GET, Thomas Huth, 2021/03/09
- [PULL 07/14] scripts/ci/gitlab-pipeline-status: give more information on failures, Thomas Huth, 2021/03/09
- [PULL 08/14] scripts/ci/gitlab-pipeline-status: give more info when pipeline not found, Thomas Huth, 2021/03/09
- [PULL 09/14] libqos/qgraph: format qgraph comments for sphinx documentation, Thomas Huth, 2021/03/09
- [PULL 10/14] docs/devel/qgraph: improve qgraph documentation, Thomas Huth, 2021/03/09
- [PULL 11/14] Acceptance Tests: restore downloading of VM images,
Thomas Huth <=
- [PULL 12/14] Acceptance Tests: restore filtering of tests by target arch, Thomas Huth, 2021/03/09
- [PULL 14/14] bsd-user: Add new maintainers, Thomas Huth, 2021/03/09
- [PULL 13/14] Remove deprecated target tilegx, Thomas Huth, 2021/03/09
- Re: [PULL 00/14] Gitlab, testing and misc patches, no-reply, 2021/03/09
- Re: [PULL 00/14] Gitlab, testing and misc patches, Peter Maydell, 2021/03/10