| Message ID | 20240726134438.14720-6-crosa@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Bump Avocado to 103.0 LTS and update tests for compatibility and new features | expand |
On Fri, Jul 26, 2024 at 09:44:30AM -0400, Cleber Rosa wrote: > 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 | 6 +++++- > tests/avocado/machine_aarch64_virt.py | 14 +++++++------- > 2 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py > index e920bbf08c..1275f24532 100644 > --- a/tests/avocado/machine_aarch64_sbsaref.py > +++ b/tests/avocado/machine_aarch64_sbsaref.py > @@ -129,7 +129,11 @@ def boot_alpine_linux(self, cpu): > "-cpu", > cpu, > "-drive", > - f"file={iso_path},format=raw", > + f"file={iso_path},media=cdrom,format=raw", > + "-device", > + "virtio-rng-pci,rng=rng0", > + "-object", > + "rng-random,id=rng0,filename=/dev/urandom", > ) The commit message doesn't say anything about adding virtio-rng. If that's needed for some reason, do it as a separate commit with an explanation of the bug its fixing. > 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 > > With regards, Daniel
On Mon, Jul 29, 2024 at 6:34 AM Daniel P. Berrangé <berrange@redhat.com> wrote: > > On Fri, Jul 26, 2024 at 09:44:30AM -0400, Cleber Rosa wrote: > > 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 | 6 +++++- > > tests/avocado/machine_aarch64_virt.py | 14 +++++++------- > > 2 files changed, 12 insertions(+), 8 deletions(-) > > > > diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py > > index e920bbf08c..1275f24532 100644 > > --- a/tests/avocado/machine_aarch64_sbsaref.py > > +++ b/tests/avocado/machine_aarch64_sbsaref.py > > @@ -129,7 +129,11 @@ def boot_alpine_linux(self, cpu): > > "-cpu", > > cpu, > > "-drive", > > - f"file={iso_path},format=raw", > > + f"file={iso_path},media=cdrom,format=raw", > > + "-device", > > + "virtio-rng-pci,rng=rng0", > > + "-object", > > + "rng-random,id=rng0,filename=/dev/urandom", > > ) > > The commit message doesn't say anything about adding virtio-rng. > If that's needed for some reason, do it as a separate commit > with an explanation of the bug its fixing. > This is actually a rebase mistake. virtio-rng was removed in 21f123f3c. I'll fix it in a v2. Thanks for spotting it, - Cleber.
diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index e920bbf08c..1275f24532 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -129,7 +129,11 @@ def boot_alpine_linux(self, cpu): "-cpu", cpu, "-drive", - f"file={iso_path},format=raw", + f"file={iso_path},media=cdrom,format=raw", + "-device", + "virtio-rng-pci,rng=rng0", + "-object", + "rng-random,id=rng0,filename=/dev/urandom", ) 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')
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 | 6 +++++- tests/avocado/machine_aarch64_virt.py | 14 +++++++------- 2 files changed, 12 insertions(+), 8 deletions(-)