testsuite: Build bookworm arm64 image in no-cross test

Message ID 20240805070535.18243-1-ubely@ilbers.de
State Accepted, archived
Headers show
Series testsuite: Build bookworm arm64 image in no-cross test | expand

Commit Message

Uladzimir Bely Aug. 5, 2024, 7:05 a.m. UTC
Instead of legacy bullseye, build and run stable bookworm image
for qemuarm64 target.

Images for amd64 and arm64 are more likely to be required by custom
run tests (e.g. pending "container fetcher and pre-loader").

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 testsuite/citest.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Uladzimir Bely Aug. 7, 2024, 2:36 p.m. UTC | #1
On Mon, 2024-08-05 at 10:05 +0300, Uladzimir Bely wrote:
> Instead of legacy bullseye, build and run stable bookworm image
> for qemuarm64 target.
> 
> Images for amd64 and arm64 are more likely to be required by custom
> run tests (e.g. pending "container fetcher and pre-loader").
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  testsuite/citest.py | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/testsuite/citest.py b/testsuite/citest.py
> index 4e1634b7..7064c1e4 100755
> --- a/testsuite/citest.py
> +++ b/testsuite/citest.py
> @@ -203,7 +203,7 @@ class NoCrossTest(CIBaseTest):
>          targets = [
>              'mc:qemuarm-buster:isar-image-ci',
>              'mc:qemuarm-bullseye:isar-image-base',
> -            'mc:qemuarm64-bullseye:isar-image-ci',
> +            'mc:qemuarm64-bookworm:isar-image-ci',
>              'mc:qemui386-buster:isar-image-base',
>              'mc:qemui386-bullseye:isar-image-base',
>              'mc:qemuamd64-buster:isar-image-ci',
> @@ -334,7 +334,7 @@ class SignatureTest(CIBaseTest):
>              'mc:qemuamd64-bullseye:isar-image-ci',
>              'mc:qemuarm-bullseye:isar-image-base',
>              'mc:qemuarm-bullseye:isar-image-base:do_populate_sdk',
> -            'mc:qemuarm64-bullseye:isar-image-base',
> +            'mc:qemuarm64-bookworm:isar-image-base',
>              'mc:qemuamd64-focal:isar-image-base',
>          ]
>  
> @@ -518,25 +518,25 @@ class VmBootTestFull(CIBaseTest):
>              script='test_systemd_unit.sh getty.target 10',
>          )
>  
> -    def test_arm64_bullseye(self):
> +    def test_arm64_bookworm(self):
>          self.init()
> -        self.vm_start('arm64', 'bullseye', image='isar-image-ci',
> keep=True)
> +        self.vm_start('arm64', 'bookworm', image='isar-image-ci',
> keep=True)
>  
> -    def test_arm64_bullseye_getty_target(self):
> +    def test_arm64_bookworm_getty_target(self):
>          self.init()
>          self.vm_start(
>              'arm64',
> -            'bullseye',
> +            'bookworm',
>              image='isar-image-ci',
>              cmd='systemctl is-active getty.target',
>              keep=True,
>          )
>  
> -    def test_arm64_bullseye_example_module(self):
> +    def test_arm64_bookworm_example_module(self):
>          self.init()
>          self.vm_start(
>              'arm64',
> -            'bullseye',
> +            'bookworm',
>              image='isar-image-ci',
>              script='test_kernel_module.sh example_module',
>          )
> -- 
> 2.44.2
> 

Applied to next.

Patch

diff --git a/testsuite/citest.py b/testsuite/citest.py
index 4e1634b7..7064c1e4 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -203,7 +203,7 @@  class NoCrossTest(CIBaseTest):
         targets = [
             'mc:qemuarm-buster:isar-image-ci',
             'mc:qemuarm-bullseye:isar-image-base',
-            'mc:qemuarm64-bullseye:isar-image-ci',
+            'mc:qemuarm64-bookworm:isar-image-ci',
             'mc:qemui386-buster:isar-image-base',
             'mc:qemui386-bullseye:isar-image-base',
             'mc:qemuamd64-buster:isar-image-ci',
@@ -334,7 +334,7 @@  class SignatureTest(CIBaseTest):
             'mc:qemuamd64-bullseye:isar-image-ci',
             'mc:qemuarm-bullseye:isar-image-base',
             'mc:qemuarm-bullseye:isar-image-base:do_populate_sdk',
-            'mc:qemuarm64-bullseye:isar-image-base',
+            'mc:qemuarm64-bookworm:isar-image-base',
             'mc:qemuamd64-focal:isar-image-base',
         ]
 
@@ -518,25 +518,25 @@  class VmBootTestFull(CIBaseTest):
             script='test_systemd_unit.sh getty.target 10',
         )
 
-    def test_arm64_bullseye(self):
+    def test_arm64_bookworm(self):
         self.init()
-        self.vm_start('arm64', 'bullseye', image='isar-image-ci', keep=True)
+        self.vm_start('arm64', 'bookworm', image='isar-image-ci', keep=True)
 
-    def test_arm64_bullseye_getty_target(self):
+    def test_arm64_bookworm_getty_target(self):
         self.init()
         self.vm_start(
             'arm64',
-            'bullseye',
+            'bookworm',
             image='isar-image-ci',
             cmd='systemctl is-active getty.target',
             keep=True,
         )
 
-    def test_arm64_bullseye_example_module(self):
+    def test_arm64_bookworm_example_module(self):
         self.init()
         self.vm_start(
             'arm64',
-            'bullseye',
+            'bookworm',
             image='isar-image-ci',
             script='test_kernel_module.sh example_module',
         )