From: Cleber Rosa <crosa@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Marcin Juszkiewicz" <marcin.juszkiewicz@linaro.org>,
"Pavel Dovgalyuk" <pavel.dovgaluk@ispras.ru>,
"Radoslaw Biernacki" <rad@semihalf.com>,
"Troy Lee" <leetroy@gmail.com>,
"Akihiko Odaki" <akihiko.odaki@daynix.com>,
"Beraldo Leal" <bleal@redhat.com>,
kvm@vger.kernel.org, "Joel Stanley" <joel@jms.id.au>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>,
"Sriram Yagnaraman" <sriram.yagnaraman@ericsson.com>,
"Cédric Le Goater" <clg@kaod.org>, "Paul Durrant" <paul@xen.org>,
"Eric Auger" <eric.auger@redhat.com>,
"David Woodhouse" <dwmw2@infradead.org>,
qemu-arm@nongnu.org, "Cleber Rosa" <crosa@redhat.com>,
"Andrew Jeffery" <andrew@codeconstruct.com.au>,
"Jamin Lin" <jamin_lin@aspeedtech.com>,
"Steven Lee" <steven_lee@aspeedtech.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Yoshinori Sato" <ysato@users.sourceforge.jp>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Thomas Huth" <thuth@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Leif Lindholm" <quic_llindhol@quicinc.com>
Subject: [PATCH v2 4/9] tests/avocado: machine aarch64: standardize location and RO access
Date: Tue, 6 Aug 2024 13:31:14 -0400 [thread overview]
Message-ID: <20240806173119.582857-5-crosa@redhat.com> (raw)
In-Reply-To: <20240806173119.582857-1-crosa@redhat.com>
The tests under machine_aarch64_virt.py and machine_aarch64_sbsaref.py
should not be writing to the ISO files. By adding "media=cdrom" the
"ro" is autmatically set.
While at it, let's use a single code style and hash for the ISO url.
Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
tests/avocado/machine_aarch64_sbsaref.py | 2 +-
tests/avocado/machine_aarch64_virt.py | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py
index e920bbf08c..756f316ac9 100644
--- a/tests/avocado/machine_aarch64_sbsaref.py
+++ b/tests/avocado/machine_aarch64_sbsaref.py
@@ -129,7 +129,7 @@ def boot_alpine_linux(self, cpu):
"-cpu",
cpu,
"-drive",
- f"file={iso_path},format=raw",
+ f"file={iso_path},media=cdrom,format=raw",
)
self.vm.launch()
diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py
index a90dc6ff4b..6831d2c0ed 100644
--- a/tests/avocado/machine_aarch64_virt.py
+++ b/tests/avocado/machine_aarch64_virt.py
@@ -37,13 +37,13 @@ def test_alpine_virt_tcg_gic_max(self):
:avocado: tags=machine:virt
:avocado: tags=accel:tcg
"""
- iso_url = ('https://dl-cdn.alpinelinux.org/'
- 'alpine/v3.17/releases/aarch64/'
- 'alpine-standard-3.17.2-aarch64.iso')
+ iso_url = (
+ "https://dl-cdn.alpinelinux.org/"
+ "alpine/v3.17/releases/aarch64/alpine-standard-3.17.2-aarch64.iso"
+ )
- # Alpine use sha256 so I recalculated this myself
- iso_sha1 = '76284fcd7b41fe899b0c2375ceb8470803eea839'
- iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1)
+ iso_hash = "5a36304ecf039292082d92b48152a9ec21009d3a62f459de623e19c4bd9dc027"
+ iso_path = self.fetch_asset(iso_url, algorithm="sha256", asset_hash=iso_hash)
self.vm.set_console()
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
@@ -60,7 +60,7 @@ def test_alpine_virt_tcg_gic_max(self):
self.vm.add_args("-smp", "2", "-m", "1024")
self.vm.add_args('-bios', os.path.join(BUILD_DIR, 'pc-bios',
'edk2-aarch64-code.fd'))
- self.vm.add_args("-drive", f"file={iso_path},format=raw")
+ self.vm.add_args("-drive", f"file={iso_path},media=cdrom,format=raw")
self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0')
self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom')
--
2.45.2
next prev parent reply other threads:[~2024-08-06 17:32 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-06 17:31 [PATCH v2 0/9] Bump Avocado to 103.0 LTS and update tests for compatibility and new features Cleber Rosa
2024-08-06 17:31 ` [PATCH v2 1/9] Bump avocado to 103.0 Cleber Rosa
2024-08-06 17:31 ` [PATCH v2 2/9] tests/avocado: apply proper skipUnless decorator Cleber Rosa
2024-08-06 19:28 ` Philippe Mathieu-Daudé
2024-08-12 10:21 ` Thomas Huth
2024-08-06 17:31 ` [PATCH v2 3/9] tests/avocado: add cdrom permission related tests Cleber Rosa
2024-08-16 14:46 ` Thomas Huth
2024-08-06 17:31 ` Cleber Rosa [this message]
2024-08-06 17:31 ` [PATCH v2 5/9] tests/avocado: simplify parameters on fetch_asset with name only Cleber Rosa
2024-08-06 17:31 ` [PATCH v2 6/9] tests/avocado/boot_xen.py: fetch kernel during test setUp() Cleber Rosa
2024-08-06 17:31 ` [PATCH v2 7/9] tests/avocado/tuxrun_baselines.py: use Avocado's zstd support Cleber Rosa
2024-08-06 18:20 ` Marcin Juszkiewicz
2024-08-07 17:26 ` Cleber Rosa
2024-08-06 17:31 ` [PATCH v2 8/9] tests/avocado/machine_aarch64_sbsaref.py: allow for rw usage of image Cleber Rosa
2024-08-06 19:30 ` Philippe Mathieu-Daudé
2024-08-07 17:26 ` Cleber Rosa
2024-08-06 17:31 ` [PATCH v2 9/9] Avocado tests: allow for parallel execution of tests Cleber Rosa
2024-08-12 10:17 ` Thomas Huth
2024-08-15 14:08 ` Cleber Rosa
2024-08-15 16:02 ` Thomas Huth
2024-08-06 18:20 ` [PATCH v2 0/9] Bump Avocado to 103.0 LTS and update tests for compatibility and new features Marcin Juszkiewicz
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=20240806173119.582857-5-crosa@redhat.com \
--to=crosa@redhat.com \
--cc=akihiko.odaki@daynix.com \
--cc=alex.bennee@linaro.org \
--cc=andrew@codeconstruct.com.au \
--cc=aurelien@aurel32.net \
--cc=bleal@redhat.com \
--cc=clg@kaod.org \
--cc=dwmw2@infradead.org \
--cc=eric.auger@redhat.com \
--cc=jamin_lin@aspeedtech.com \
--cc=joel@jms.id.au \
--cc=kvm@vger.kernel.org \
--cc=leetroy@gmail.com \
--cc=marcin.juszkiewicz@linaro.org \
--cc=paul@xen.org \
--cc=pavel.dovgaluk@ispras.ru \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=quic_llindhol@quicinc.com \
--cc=rad@semihalf.com \
--cc=sriram.yagnaraman@ericsson.com \
--cc=steven_lee@aspeedtech.com \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
--cc=ysato@users.sourceforge.jp \
/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