Skip to contentSkip to conversation

acceptance: update asset urls for the Bionic aarch64 installer

PATCH In review Philippe Mathieu-Daudé 1 participant 4 messages Aug 10, 2020 – Aug 12, 2020

lore
Share & tools
lore
#0 lore raw

v2 cover acceptance: update asset urls for the Bionic aarch64 installer

v2 of Paolo's patch:
https://www.mail-archive.com/[email protected]/msg728610.html

Do not update the binaries (and their hash), update the path to the current tested binaries.

Supersedes: <[email protected]>

Philippe Mathieu-Daudé (2):
tests/acceptance/boot_linux: Extract common URL from xlnx-versal test tests/acceptance/boot_linux: Use stable URL for xlnx-versal test

 tests/acceptance/boot_linux_console.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
Signature · 1 line
2.21.3
#1 lore raw

PATCH v2 1/2 tests/acceptance/boot_linux: Extract common URL from xlnx-versal test

Both files refer to the same directory. Store the common part in a new variable.

---
 tests/acceptance/boot_linux_console.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
tests/acceptance/boot_linux_console.py +5 -6
index 73cc69c499..2f22eddd0d 100644
@@ -335,15 +335,14 @@ def test_aarch64_xlnx_versal_virt(self):
         :avocado: tags=device:pl011
         :avocado: tags=device:arm_gicv3
         """
-        kernel_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/'
-                      'bionic-updates/main/installer-arm64/current/images/'
-                      'netboot/ubuntu-installer/arm64/linux')
+        images_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/'
+                      'bionic-updates/main/installer-arm64/'
+                      'current/images/')
+        kernel_url = images_url + 'netboot/ubuntu-installer/arm64/linux'
         kernel_hash = '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
 
-        initrd_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/'
-                      'bionic-updates/main/installer-arm64/current/images/'
-                      'netboot/ubuntu-installer/arm64/initrd.gz')
+        initrd_url = images_url + 'netboot/ubuntu-installer/arm64/initrd.gz'
         initrd_hash = 'd385d3e88d53e2004c5d43cbe668b458a094f772'
         initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash)
 
Signature · 1 line
2.21.3
#2 lore raw

PATCH v2 2/2 tests/acceptance/boot_linux: Use stable URL for xlnx-versal test

In reply to Philippe Mathieu-Daudé

In commit 27dfbafaa7 we added an acceptance test for the xlnx-versal-virt machine but used an unstable URL (no guarantee the files would be updated during the next release, which occured last week on Wednesday, Aug 5). Fix by using the stable directory name containing the release date.

---
 tests/acceptance/boot_linux_console.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/acceptance/boot_linux_console.py +1 -1
index 2f22eddd0d..742dc30bc1 100644
@@ -337,7 +337,7 @@ def test_aarch64_xlnx_versal_virt(self):
         """
         images_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/'
                       'bionic-updates/main/installer-arm64/'
-                      'current/images/')
+                      '20101020ubuntu543.15/images/')
         kernel_url = images_url + 'netboot/ubuntu-installer/arm64/linux'
         kernel_hash = '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
Signature · 1 line
2.21.3
#3 lore raw
In reply to Philippe Mathieu-Daudé
Quoted 6 lines · Philippe Mathieu-Daudé

v2 of Paolo's patch:
https://www.mail-archive.com/[email protected]/msg728610.html

Do not update the binaries (and their hash), update the path to the current tested binaries.

Quoted 9 lines

Supersedes: <[email protected]>

Philippe Mathieu-Daudé (2):
tests/acceptance/boot_linux: Extract common URL from xlnx-versal test tests/acceptance/boot_linux: Use stable URL for xlnx-versal test

 tests/acceptance/boot_linux_console.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

First patch applied to my acceptance-testing tree.