| Message ID | 20240313-sbsa-ref-firmware-update-v1-3-e166703c5424@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | tests/avocado: update sbsa-ref firmware to latest | expand |
Hi Marcin, On 13/3/24 11:08, Marcin Juszkiewicz wrote: > 7.4 was released in October 2023, time to update before 7.3 gets dropped. > > Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> > --- > tests/avocado/machine_aarch64_sbsaref.py | 26 +++++++++++++------------- > 1 file changed, 13 insertions(+), 13 deletions(-) > @@ -180,23 +180,23 @@ def boot_openbsd73(self, cpu): > self.vm.launch() > wait_for_console_pattern(self, > "Welcome to the OpenBSD/arm64" > - " 7.3 installation program.") > + " 7.4 installation program.") > > - def test_sbsaref_openbsd73_cortex_a57(self): > + def test_sbsaref_openbsd_cortex_a57(self): > """ > - :avocado: tags=cpu:cortex-a57 > + :avocado: tags=cpu:cortex-a57,os:openbsd IIRC for some reason we must use one tag per line... Even if named 'tags', this is handled as a single tag, so we couldn't filter on "os:openbsd". We need: :avocado: tags=cpu:cortex-a57 :avocado: tags=os:openbsd > """ > - self.boot_openbsd73("cortex-a57") > + self.boot_openbsd("cortex-a57")
W dniu 13.03.2024 o 12:44, Philippe Mathieu-Daudé pisze: >> - :avocado: tags=cpu:cortex-a57 >> + :avocado: tags=cpu:cortex-a57,os:openbsd > > IIRC for some reason we must use one tag per line... Even if > named 'tags', this is handled as a single tag, so we couldn't > filter on "os:openbsd". We need: > > :avocado: tags=cpu:cortex-a57 > :avocado: tags=os:openbsd OK. It worked when I tested this way: $ make check-avocado AVOCADO_TAGS='machine:sbsa-ref,os:openbsd' [..] (1/3) tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s) (2/3) tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s) $ make check-avocado AVOCADO_TAGS='os:openbsd' [..] (1/3) tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s) (2/3) tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s)
On 13/3/24 14:39, Marcin Juszkiewicz wrote: > W dniu 13.03.2024 o 12:44, Philippe Mathieu-Daudé pisze: >>> - :avocado: tags=cpu:cortex-a57 >>> + :avocado: tags=cpu:cortex-a57,os:openbsd >> >> IIRC for some reason we must use one tag per line... Even if >> named 'tags', this is handled as a single tag, so we couldn't >> filter on "os:openbsd". We need: >> >> :avocado: tags=cpu:cortex-a57 >> :avocado: tags=os:openbsd > > OK. It worked when I tested this way: > > $ make check-avocado AVOCADO_TAGS='machine:sbsa-ref,os:openbsd' > [..] > (1/3) > tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s) > (2/3) > tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s) > > $ make check-avocado AVOCADO_TAGS='os:openbsd' Oh great news, TIL! > [..] > (1/3) > tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s) > (2/3) > tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s) >
On 13/3/24 16:06, Philippe Mathieu-Daudé wrote: > On 13/3/24 14:39, Marcin Juszkiewicz wrote: >> W dniu 13.03.2024 o 12:44, Philippe Mathieu-Daudé pisze: >>>> - :avocado: tags=cpu:cortex-a57 >>>> + :avocado: tags=cpu:cortex-a57,os:openbsd >>> >>> IIRC for some reason we must use one tag per line... Even if >>> named 'tags', this is handled as a single tag, so we couldn't >>> filter on "os:openbsd". We need: >>> >>> :avocado: tags=cpu:cortex-a57 >>> :avocado: tags=os:openbsd >> >> OK. It worked when I tested this way: >> >> $ make check-avocado AVOCADO_TAGS='machine:sbsa-ref,os:openbsd' >> [..] >> (1/3) >> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_cortex_a57: PASS (16.18 s) >> (2/3) >> tests/avocado/machine_aarch64_sbsaref.py:Aarch64SbsarefMachine.test_sbsaref_openbsd_neoverse_n1: PASS (16.06 s) >> >> $ make check-avocado AVOCADO_TAGS='os:openbsd' > > Oh great news, TIL! Still thinking a bit about it, using one line for one tag reduce patch churn when adding/removing tags, and eases rebasing / cherry-picking.
diff --git a/tests/avocado/machine_aarch64_sbsaref.py b/tests/avocado/machine_aarch64_sbsaref.py index 259225f15f..94c9f81d72 100644 --- a/tests/avocado/machine_aarch64_sbsaref.py +++ b/tests/avocado/machine_aarch64_sbsaref.py @@ -159,14 +159,14 @@ def test_sbsaref_alpine_linux_max(self): # This tests the whole boot chain from EFI to Userspace # We only boot a whole OS for the current top level CPU and GIC # Other test profiles should use more minimal boots - def boot_openbsd73(self, cpu): + def boot_openbsd(self, cpu): self.fetch_firmware() img_url = ( - "https://cdn.openbsd.org/pub/OpenBSD/7.3/arm64/miniroot73.img" + "https://cdn.openbsd.org/pub/OpenBSD/7.4/arm64/miniroot74.img" ) - img_hash = "7fc2c75401d6f01fbfa25f4953f72ad7d7c18650056d30755c44b9c129b707e5" + img_hash = "7b08b2ce081cff6408d183f7152ddcfd2779912104866e4fdf6ae2d864b51142" img_path = self.fetch_asset(img_url, algorithm="sha256", asset_hash=img_hash) self.vm.set_console() @@ -180,23 +180,23 @@ def boot_openbsd73(self, cpu): self.vm.launch() wait_for_console_pattern(self, "Welcome to the OpenBSD/arm64" - " 7.3 installation program.") + " 7.4 installation program.") - def test_sbsaref_openbsd73_cortex_a57(self): + def test_sbsaref_openbsd_cortex_a57(self): """ - :avocado: tags=cpu:cortex-a57 + :avocado: tags=cpu:cortex-a57,os:openbsd """ - self.boot_openbsd73("cortex-a57") + self.boot_openbsd("cortex-a57") - def test_sbsaref_openbsd73_neoverse_n1(self): + def test_sbsaref_openbsd_neoverse_n1(self): """ - :avocado: tags=cpu:neoverse-n1 + :avocado: tags=cpu:neoverse-n1,os:openbsd """ - self.boot_openbsd73("neoverse-n1") + self.boot_openbsd("neoverse-n1") - def test_sbsaref_openbsd73_max(self): + def test_sbsaref_openbsd_max(self): """ - :avocado: tags=cpu:max + :avocado: tags=cpu:max,os:openbsd """ - self.boot_openbsd73("max") + self.boot_openbsd("max")
7.4 was released in October 2023, time to update before 7.3 gets dropped. Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> --- tests/avocado/machine_aarch64_sbsaref.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)