On 3/5/21 4:16 PM, Willian Rampazzo wrote:
> On Thu, Mar 4, 2021 at 5:44 PM Niek Linnenbank <nieklinnenbank@gmail.com> wrote:
>>
>> The image for Armbian 19.11.3 bionic has been removed from the armbian server.
>> Without the image as input the test arm_orangepi_bionic_19_11 cannot run.
>>
>> This commit removes the test completely and merges the code of the generic function
>> do_test_arm_orangepi_uboot_armbian back with the 20.08 test.
>>
>> Signed-off-by: Niek Linnenbank <nieklinnenbank@gmail.com>
>> ---
>> tests/acceptance/boot_linux_console.py | 72 ++++++++------------------
>> 1 file changed, 23 insertions(+), 49 deletions(-)
>>
>> diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot_linux_console.py
>> index eb01286799..9fadea9958 100644
>> --- a/tests/acceptance/boot_linux_console.py
>> +++ b/tests/acceptance/boot_linux_console.py
>> @@ -802,7 +802,29 @@ def test_arm_orangepi_sd(self):
>> # Wait for VM to shut down gracefully
>> self.vm.wait()
>>
>> - def do_test_arm_orangepi_uboot_armbian(self, image_path):
>> + @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'),
>> + 'Test artifacts fetched from unreliable apt.armbian.com')
>> + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited')
>> + def test_arm_orangepi_bionic_20_08(self):
>> + """
>> + :avocado: tags=arch:arm
>> + :avocado: tags=machine:orangepi-pc
>> + :avocado: tags=device:sd
>> + """
>> +
>> + # This test download a 275 MiB compressed image and expand it
>> + # to 1036 MiB, but the underlying filesystem is 1552 MiB...
>> + # As we expand it to 2 GiB we are safe.
>> +
>> + image_url = ('https://dl.armbian.com/orangepipc/archive/'
>> + 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.xz')
>
> The Armbian 20 is not available on this link anymore. I can browse just 21.
Cat-and-mouse game *sigh*.
Just to clarify here: in this patch I wanted to only make the change to remove the test for the 19.11.3 image.
And in the 3rd patch (tests/acceptance/boot_linux_console: change URL for test_arm_orangepi_bionic_20_08)
do the update for to correct the 20.08 link. So each patch fixes one problem at a time.
Does that make sense, or do you prefer that I combine them in a single patch instead?
Regards,
Niek