[v3,23/28] test/functional/aspeed: Introduce new function to fetch assets

Commit Message

Jamin Lin Feb. 13, 2025, 3:35 a.m. UTC

This method simplifies the process of fetching and extracting assets from the
Aspeed GitHub repository.

Signed-off-by: Jamin Lin <[e-mail]>
---
 tests/functional/test_aarch64_aspeed.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

Comments

Cédric Le Goater Feb. 18, 2025, 6:30 a.m. UTC | #1

On 2/13/25 04:35, Jamin Lin wrote:
> This method simplifies the process of fetching and extracting assets from the
> Aspeed GitHub repository.
> 
> Signed-off-by: Jamin Lin <[e-mail]>
> ---
>   tests/functional/test_aarch64_aspeed.py | 9 +++++----
>   1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/functional/test_aarch64_aspeed.py b/tests/functional/test_aarch64_aspeed.py
> index 9595498ace..f3d7c8331a 100755
> --- a/tests/functional/test_aarch64_aspeed.py
> +++ b/tests/functional/test_aarch64_aspeed.py
> @@ -27,14 +27,15 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
>           wait_for_console_pattern(self, '## Loading kernel from FIT Image')
>           wait_for_console_pattern(self, 'Starting kernel ...')
>   
> -    ASSET_SDK_V903_AST2700 = Asset(
> -            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.03/ast2700-default-obmc.tar.gz',
> -            '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77')


We need to keep the ASSET_SDK_V903_AST2700 definition for pre-caching the
assets. See :

https://qemu.readthedocs.io/en/v9.2.0/devel/testing/functional.html#asset-handling


Thanks,

C.


> +    def extra_aspeed_archive(self, version, file, checksum):
> +        url = 'https://github.com/AspeedTech-BMC/openbmc/releases/download'
> +        self.archive_extract(Asset(f'{url}/{version}/{file}', f'{checksum}'))
>   
>       def test_aarch64_ast2700_evb_sdk_v09_03(self):
>           self.set_machine('ast2700-evb')
>   
> -        self.archive_extract(self.ASSET_SDK_V903_AST2700)
> +        self.extra_aspeed_archive('v09.03', 'ast2700-default-obmc.tar.gz',
> +            '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77')
>   
>           num_cpu = 4
>           uboot_size = os.path.getsize(self.scratch_file('ast2700-default',

Jamin Lin Feb. 21, 2025, 1:35 a.m. UTC | #2

Hi Cedric,

> 
> On 2/13/25 04:35, Jamin Lin wrote:
> > This method simplifies the process of fetching and extracting assets
> > from the Aspeed GitHub repository.
> >
> > Signed-off-by: Jamin Lin <[e-mail]>
> > ---
> >   tests/functional/test_aarch64_aspeed.py | 9 +++++----
> >   1 file changed, 5 insertions(+), 4 deletions(-)
> >
> > diff --git a/tests/functional/test_aarch64_aspeed.py
> > b/tests/functional/test_aarch64_aspeed.py
> > index 9595498ace..f3d7c8331a 100755
> > --- a/tests/functional/test_aarch64_aspeed.py
> > +++ b/tests/functional/test_aarch64_aspeed.py
> > @@ -27,14 +27,15 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
> >           wait_for_console_pattern(self, '## Loading kernel from FIT
> Image')
> >           wait_for_console_pattern(self, 'Starting kernel ...')
> >
> > -    ASSET_SDK_V903_AST2700 = Asset(
> > -
> 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.03/ast
> 2700-default-obmc.tar.gz',
> > -
> '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77'
> )
> 
> 
> We need to keep the ASSET_SDK_V903_AST2700 definition for pre-caching the
> assets. See :
> 
> https://qemu.readthedocs.io/en/v9.2.0/devel/testing/functional.html#asset-ha
> ndling
> 
Will rework functional test.
Thanks for your review and suggestion.
Jamin
> 
> Thanks,
> 
> C.
> 
> 
> > +    def extra_aspeed_archive(self, version, file, checksum):
> > +        url =
> 'https://github.com/AspeedTech-BMC/openbmc/releases/download'
> > +        self.archive_extract(Asset(f'{url}/{version}/{file}',
> > + f'{checksum}'))
> >
> >       def test_aarch64_ast2700_evb_sdk_v09_03(self):
> >           self.set_machine('ast2700-evb')
> >
> > -        self.archive_extract(self.ASSET_SDK_V903_AST2700)
> > +        self.extra_aspeed_archive('v09.03', 'ast2700-default-obmc.tar.gz',
> > +
> > +
> '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77'
> )
> >
> >           num_cpu = 4
> >           uboot_size =
> > os.path.getsize(self.scratch_file('ast2700-default',

Patch

diff --git a/tests/functional/test_aarch64_aspeed.py b/tests/functional/test_aarch64_aspeed.py
index 9595498ace..f3d7c8331a 100755
--- a/tests/functional/test_aarch64_aspeed.py
+++ b/tests/functional/test_aarch64_aspeed.py
@@ -27,14 +27,15 @@  def do_test_aarch64_aspeed_sdk_start(self, image):
         wait_for_console_pattern(self, '## Loading kernel from FIT Image')
         wait_for_console_pattern(self, 'Starting kernel ...')
 
-    ASSET_SDK_V903_AST2700 = Asset(
-            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.03/ast2700-default-obmc.tar.gz',
-            '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77')
+    def extra_aspeed_archive(self, version, file, checksum):
+        url = 'https://github.com/AspeedTech-BMC/openbmc/releases/download'
+        self.archive_extract(Asset(f'{url}/{version}/{file}', f'{checksum}'))
 
     def test_aarch64_ast2700_evb_sdk_v09_03(self):
         self.set_machine('ast2700-evb')
 
-        self.archive_extract(self.ASSET_SDK_V903_AST2700)
+        self.extra_aspeed_archive('v09.03', 'ast2700-default-obmc.tar.gz',
+            '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77')
 
         num_cpu = 4
         uboot_size = os.path.getsize(self.scratch_file('ast2700-default',