qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Wainer dos Santos Moschetta" <wainersm@redhat.com>,
	"Beraldo Leal" <bleal@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Aurelien Jarno" <aurelien@aurel32.net>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Juan Quintela" <quintela@redhat.com>,
	"Cédric Le Goater" <clg@kaod.org>,
	"Richard Henderson" <richard.henderson@linaro.org>,
	"Joel Stanley" <joel@jms.id.au>,
	"Leif Lindholm" <quic_llindhol@quicinc.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Radoslaw Biernacki" <rad@semihalf.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"John Snow" <jsnow@redhat.com>,
	"Andrew Jeffery" <andrew@aj.id.au>,
	"David Hildenbrand" <david@redhat.com>,
	"Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>,
	"Max Filippov" <jcmvbkbc@gmail.com>,
	qemu-s390x@nongnu.org, "Cleber Rosa" <crosa@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	qemu-arm@nongnu.org, "Eduardo Habkost" <eduardo@habkost.net>,
	"Ilya Leoshkevich" <iii@linux.ibm.com>,
	"Kautuk Consul" <kconsul@linux.vnet.ibm.com>,
	"Hariharan T S" <hariharan.ts@linux.vnet.ibm.com>
Subject: [PATCH 01/18] tests/requirements.txt: bump up avocado-framework version to 101.0
Date: Mon, 24 Apr 2023 10:22:32 +0100	[thread overview]
Message-ID: <20230424092249.58552-2-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230424092249.58552-1-alex.bennee@linaro.org>

From: Kautuk Consul <kconsul@linux.vnet.ibm.com>

Avocado version 101.0 has a fix to re-compute the checksum
of an asset file if the algorithm used in the *-CHECKSUM
file isn't the same as the one being passed to it by the
avocado user (i.e. the avocado_qemu python module).
In the earlier avocado versions this fix wasn't there due
to which if the checksum wouldn't match the earlier
checksum (calculated by a different algorithm), the avocado
code would start downloading a fresh image from the internet
URL thus making the test-cases take longer to execute.

Bump up the avocado-framework version to 101.0.

Signed-off-by: Kautuk Consul <kconsul@linux.vnet.ibm.com>
Tested-by: Hariharan T S <hariharan.ts@linux.vnet.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230417134321.3627231-2-alex.bennee@linaro.org>
Message-Id: <20230327115030.3418323-2-kconsul@linux.vnet.ibm.com>
Message-Id: <20230330101141.30199-10-alex.bennee@linaro.org>

---
v2
  - limit --max-parallel-tasks $(JOBS_OPTION:-j%=%)
---
 tests/Makefile.include | 18 +++++++++++-------
 tests/requirements.txt |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 9422ddaece..a4de0ad5a2 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -138,14 +138,18 @@ get-vm-image-fedora-31-%: check-venv
 # download all vm images, according to defined targets
 get-vm-images: check-venv $(patsubst %,get-vm-image-fedora-31-%, $(FEDORA_31_DOWNLOAD))
 
+JOBS_OPTION=$(lastword -j1 $(filter-out -j, $(filter -j%,$(MAKEFLAGS))))
+
 check-avocado: check-venv $(TESTS_RESULTS_DIR) get-vm-images
-	$(call quiet-command, \
-            $(TESTS_PYTHON) -m avocado \
-            --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) \
-            $(if $(AVOCADO_TAGS),, --filter-by-tags-include-empty \
-			--filter-by-tags-include-empty-key) \
-            $(AVOCADO_CMDLINE_TAGS) \
-            $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), \
+	$(call quiet-command, 							\
+            $(TESTS_PYTHON) -m avocado 						\
+            --show=$(AVOCADO_SHOW) run --job-results-dir=$(TESTS_RESULTS_DIR) 	\
+            $(if $(AVOCADO_TAGS),, 						\
+			--filter-by-tags-include-empty 				\
+			--filter-by-tags-include-empty-key) 			\
+		--max-parallel-tasks $(JOBS_OPTION:-j%=%) 			\
+            $(AVOCADO_CMDLINE_TAGS) 						\
+            $(if $(GITLAB_CI),,--failfast) $(AVOCADO_TESTS), 			\
             "AVOCADO", "tests/avocado")
 
 check-acceptance-deprecated-warning:
diff --git a/tests/requirements.txt b/tests/requirements.txt
index 0ba561b6bd..a6f73da681 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -2,5 +2,5 @@
 # in the tests/venv Python virtual environment. For more info,
 # refer to: https://pip.pypa.io/en/stable/user_guide/#id1
 # Note that qemu.git/python/ is always implicitly installed.
-avocado-framework==88.1
+avocado-framework==101.0
 pycdlib==1.11.0
-- 
2.39.2



  reply	other threads:[~2023-04-24  9:24 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-24  9:22 [PATCH 00/18] testing/next: avocado, docs (pre-PR) Alex Bennée
2023-04-24  9:22 ` Alex Bennée [this message]
2023-04-24  9:22 ` [PATCH 02/18] tests/avocado: use the new snapshots for testing Alex Bennée
2023-04-24  9:27   ` Thomas Huth
2023-04-24  9:22 ` [PATCH 03/18] tests/avocado: Add set of boot tests on SBSA-ref Alex Bennée
2023-04-24  9:22 ` [PATCH 04/18] gitlab-ci: Avoid to re-run "configure" in the device-crash-test jobs Alex Bennée
2023-04-24  9:22 ` [PATCH 05/18] scripts/device-crash-test: Add a parameter to run with TCG only Alex Bennée
2023-04-24  9:22 ` [PATCH 06/18] qemu-options: finesse the recommendations around -blockdev Alex Bennée
2023-04-24  9:22 ` [PATCH 07/18] .gitlab-ci.d/cirrus: Drop the CI job for compiling with FreeBSD 12 Alex Bennée
2023-04-24 10:46   ` Richard Henderson
2023-04-24  9:22 ` [PATCH 08/18] tests/avocado: Make ssh_command_output_contains() globally available Alex Bennée
2023-04-24  9:22 ` [PATCH 09/18] tests/avocado/machine_aspeed: Fix the broken ast2[56]00_evb_sdk tests Alex Bennée
2023-04-24  9:22 ` [PATCH 10/18] MAINTAINERS: Cover tests/avocado/machine_aspeed.py Alex Bennée
2023-04-24  9:22 ` [PATCH 11/18] avocado_qemu/__init__.py: factor out the qemu-img finding Alex Bennée
2023-04-24  9:22 ` [PATCH 12/18] tests/avocado/tuxrun_baselines.py: improve code coverage for ppc64 Alex Bennée
2023-04-24  9:22 ` [PATCH 13/18] tests/tcg: limit the scope of the plugin tests Alex Bennée
2023-04-24  9:22 ` [PATCH 14/18] qemu-options.hx: Update descriptions of memory options for NUMA node Alex Bennée
2023-04-24  9:22 ` [PATCH 15/18] docs/system: remove excessive punctuation from guest-loader docs Alex Bennée
2023-04-24  9:22 ` [PATCH 16/18] docs/devel: make a statement about includes Alex Bennée
2023-04-24  9:22 ` [PATCH 17/18] docs/devel: mention the spacing requirement for QOM Alex Bennée
2023-04-26  8:48   ` Mark Cave-Ayland
2023-04-24  9:22 ` [PATCH 18/18] docs/style: call out the use of GUARD macros Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230424092249.58552-2-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=andrew@aj.id.au \
    --cc=armbru@redhat.com \
    --cc=aurelien@aurel32.net \
    --cc=berrange@redhat.com \
    --cc=bleal@redhat.com \
    --cc=clg@kaod.org \
    --cc=crosa@redhat.com \
    --cc=david@redhat.com \
    --cc=edgar.iglesias@gmail.com \
    --cc=eduardo@habkost.net \
    --cc=hariharan.ts@linux.vnet.ibm.com \
    --cc=iii@linux.ibm.com \
    --cc=jcmvbkbc@gmail.com \
    --cc=joel@jms.id.au \
    --cc=jsnow@redhat.com \
    --cc=kbastian@mail.uni-paderborn.de \
    --cc=kconsul@linux.vnet.ibm.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=quic_llindhol@quicinc.com \
    --cc=quintela@redhat.com \
    --cc=rad@semihalf.com \
    --cc=richard.henderson@linaro.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@redhat.com \
    --cc=wainersm@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).