diff mbox series

[1/3] tests/avocado: update AArch64 tests to Alpine 3.17.2

Message ID 20230302191146.1790560-1-marcin.juszkiewicz@linaro.org
State New
Headers show
Series [1/3] tests/avocado: update AArch64 tests to Alpine 3.17.2 | expand

Commit Message

Marcin Juszkiewicz March 2, 2023, 7:11 p.m. UTC
To test Alpine boot on SBSA-Ref target we need Alpine Linux
'standard' image as 'virt' one lacks kernel modules.

So to minimalize Avocado cache I move test to 'standard' image.

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 tests/avocado/machine_aarch64_virt.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Alex Bennée March 3, 2023, 11:24 a.m. UTC | #1
Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> writes:

Next time please ensure you have a cover letter for a multi-patch series
as the various bits of tooling get confused without one.

> To test Alpine boot on SBSA-Ref target we need Alpine Linux
> 'standard' image as 'virt' one lacks kernel modules.

Is this kernel modules we will need for SBSA "hw" choices?

> So to minimalize Avocado cache I move test to 'standard' image.
>
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

> ---
>  tests/avocado/machine_aarch64_virt.py | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py
> index 25dab8dc00..a90dc6ff4b 100644
> --- a/tests/avocado/machine_aarch64_virt.py
> +++ b/tests/avocado/machine_aarch64_virt.py
> @@ -38,11 +38,11 @@ def test_alpine_virt_tcg_gic_max(self):
>          :avocado: tags=accel:tcg
>          """
>          iso_url = ('https://dl-cdn.alpinelinux.org/'
> -                   'alpine/v3.16/releases/aarch64/'
> -                   'alpine-virt-3.16.3-aarch64.iso')
> +                   'alpine/v3.17/releases/aarch64/'
> +                   'alpine-standard-3.17.2-aarch64.iso')
>  
>          # Alpine use sha256 so I recalculated this myself
> -        iso_sha1 = '0683bc089486d55c91bf6607d5ecb93925769bc0'
> +        iso_sha1 = '76284fcd7b41fe899b0c2375ceb8470803eea839'
>          iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1)
>  
>          self.vm.set_console()
> @@ -65,7 +65,7 @@ def test_alpine_virt_tcg_gic_max(self):
>          self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom')
>  
>          self.vm.launch()
> -        self.wait_for_console_pattern('Welcome to Alpine Linux 3.16')
> +        self.wait_for_console_pattern('Welcome to Alpine Linux 3.17')
>  
>  
>      def common_aarch64_virt(self, machine):
Marcin Juszkiewicz March 3, 2023, 3:24 p.m. UTC | #2
W dniu 3.03.2023 o 12:24, Alex Bennée pisze:
> 
> Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> writes:
> 
> Next time please ensure you have a cover letter for a multi-patch series
> as the various bits of tooling get confused without one.
> 
>> To test Alpine boot on SBSA-Ref target we need Alpine Linux
>> 'standard' image as 'virt' one lacks kernel modules.
> 
> Is this kernel modules we will need for SBSA "hw" choices?

Yes. Virt image fails to boot on sbsa-ref:

   Booting `Linux virt'
-console: Mounting boot media failed.
console: initramfs emergency recovery shell launched. Type 'exit' to 
continue boot
console: sh: can't access tty; job control turned off
diff mbox series

Patch

diff --git a/tests/avocado/machine_aarch64_virt.py b/tests/avocado/machine_aarch64_virt.py
index 25dab8dc00..a90dc6ff4b 100644
--- a/tests/avocado/machine_aarch64_virt.py
+++ b/tests/avocado/machine_aarch64_virt.py
@@ -38,11 +38,11 @@  def test_alpine_virt_tcg_gic_max(self):
         :avocado: tags=accel:tcg
         """
         iso_url = ('https://dl-cdn.alpinelinux.org/'
-                   'alpine/v3.16/releases/aarch64/'
-                   'alpine-virt-3.16.3-aarch64.iso')
+                   'alpine/v3.17/releases/aarch64/'
+                   'alpine-standard-3.17.2-aarch64.iso')
 
         # Alpine use sha256 so I recalculated this myself
-        iso_sha1 = '0683bc089486d55c91bf6607d5ecb93925769bc0'
+        iso_sha1 = '76284fcd7b41fe899b0c2375ceb8470803eea839'
         iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1)
 
         self.vm.set_console()
@@ -65,7 +65,7 @@  def test_alpine_virt_tcg_gic_max(self):
         self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom')
 
         self.vm.launch()
-        self.wait_for_console_pattern('Welcome to Alpine Linux 3.16')
+        self.wait_for_console_pattern('Welcome to Alpine Linux 3.17')
 
 
     def common_aarch64_virt(self, machine):