[PATCH] tests/functional: Switch back to the gitlab URLs for the advent calendar tests

[PATCH] tests/functional: Switch back to the gitlab URLs for the advent calendar tests

[Thomas Huth]

Shortly after we switched to the original URLs on qemu-advent-calendar.org,
the server went offline - looks like we are better off using the gitlab
URLs again instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 tests/functional/test_arm_vexpress.py            | 2 +-
 tests/functional/test_m68k_mcf5208evb.py         | 2 +-
 tests/functional/test_microblazeel_s3adsp1800.py | 4 ++--
 tests/functional/test_or1k_sim.py                | 2 +-
 tests/functional/test_ppc64_e500.py              | 2 +-
 tests/functional/test_ppc_mac.py                 | 2 +-
 tests/functional/test_sh4_r2d.py                 | 2 +-
 tests/functional/test_sparc_sun4m.py             | 2 +-
 tests/functional/test_xtensa_lx60.py             | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/functional/test_arm_vexpress.py b/tests/functional/test_arm_vexpress.py
index cc6015112b..6bd6290030 100755
--- a/tests/functional/test_arm_vexpress.py
+++ b/tests/functional/test_arm_vexpress.py
@@ -11,7 +11,7 @@
 class VExpressTest(LinuxKernelTest):
 
     ASSET_DAY16 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day16.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day16.tar.xz',
         '63311adb2d4c4e7a73214a86d29988add87266a909719c56acfadd026b4110a7')
 
     def test_arm_vexpressa9(self):
diff --git a/tests/functional/test_m68k_mcf5208evb.py b/tests/functional/test_m68k_mcf5208evb.py
index 869ccc88df..00c59590c3 100755
--- a/tests/functional/test_m68k_mcf5208evb.py
+++ b/tests/functional/test_m68k_mcf5208evb.py
@@ -13,7 +13,7 @@
 class Mcf5208EvbTest(LinuxKernelTest):
 
     ASSET_DAY07 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day07.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day07.tar.xz',
         '753c2f3837126b7c6ba92d0b1e0b156e8a2c5131d2d576bb0b9a763fae73c08a')
 
     def test_m68k_mcf5208evb(self):
diff --git a/tests/functional/test_microblazeel_s3adsp1800.py b/tests/functional/test_microblazeel_s3adsp1800.py
index faa3927f2e..47c941d487 100755
--- a/tests/functional/test_microblazeel_s3adsp1800.py
+++ b/tests/functional/test_microblazeel_s3adsp1800.py
@@ -18,8 +18,8 @@ class MicroblazeelMachine(QemuSystemTest):
     timeout = 90
 
     ASSET_IMAGE = Asset(
-        ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
-        'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
+        ('https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day13.tar.xz'),
+        '67e4c502651f8801e724ecc26403f1d0cdbc00549b033166e2e8cd14e9d49fef')
 
     def test_microblazeel_s3adsp1800(self):
         self.require_netdev('user')
diff --git a/tests/functional/test_or1k_sim.py b/tests/functional/test_or1k_sim.py
index aa2a1f08d2..10e0437c50 100755
--- a/tests/functional/test_or1k_sim.py
+++ b/tests/functional/test_or1k_sim.py
@@ -13,7 +13,7 @@
 class OpenRISC1kSimTest(LinuxKernelTest):
 
     ASSET_DAY20 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day20.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day20.tar.xz',
         'ff9d7dd7c6bdba325bd85ee85c02db61ff653e129558aeffe6aff55bffb6763a')
 
     def test_or1k_sim(self):
diff --git a/tests/functional/test_ppc64_e500.py b/tests/functional/test_ppc64_e500.py
index 3558ae0c8c..f1af92373e 100755
--- a/tests/functional/test_ppc64_e500.py
+++ b/tests/functional/test_ppc64_e500.py
@@ -10,7 +10,7 @@
 class E500Test(LinuxKernelTest):
 
     ASSET_DAY19 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day19.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day19.tar.xz',
         '20b1bb5a8488c664defbb5d283addc91a05335a936c63b3f5ff7eee74b725755')
 
     def test_ppc64_e500(self):
diff --git a/tests/functional/test_ppc_mac.py b/tests/functional/test_ppc_mac.py
index a6b1ca2d4c..3f45e37a45 100755
--- a/tests/functional/test_ppc_mac.py
+++ b/tests/functional/test_ppc_mac.py
@@ -10,7 +10,7 @@
 class MacTest(LinuxKernelTest):
 
     ASSET_DAY15 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day15.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day15.tar.xz',
         '03e0757c131d2959decf293a3572d3b96c5a53587165bf05ce41b2818a2bccd5')
 
     def do_day15_test(self):
diff --git a/tests/functional/test_sh4_r2d.py b/tests/functional/test_sh4_r2d.py
index 5fe8cf9f8d..c3cfff79ad 100755
--- a/tests/functional/test_sh4_r2d.py
+++ b/tests/functional/test_sh4_r2d.py
@@ -13,7 +13,7 @@
 class R2dTest(LinuxKernelTest):
 
     ASSET_DAY09 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day09.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day09.tar.xz',
         'a61b44d2630a739d1380cc4ff4b80981d47ccfd5992f1484ccf48322c35f09ac')
 
     # This test has a 6-10% failure rate on various hosts that look
diff --git a/tests/functional/test_sparc_sun4m.py b/tests/functional/test_sparc_sun4m.py
index b334375820..573f85222a 100755
--- a/tests/functional/test_sparc_sun4m.py
+++ b/tests/functional/test_sparc_sun4m.py
@@ -11,7 +11,7 @@
 class Sun4mTest(LinuxKernelTest):
 
     ASSET_DAY11 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day11.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day11.tar.xz',
         'c776533ba756bf4dd3f1fc4c024fb50ef0d853e05c5f5ddf0900a32d1eaa49e0')
 
     def test_sparc_ss20(self):
diff --git a/tests/functional/test_xtensa_lx60.py b/tests/functional/test_xtensa_lx60.py
index 8ce5206a4f..d4ad92dc6c 100755
--- a/tests/functional/test_xtensa_lx60.py
+++ b/tests/functional/test_xtensa_lx60.py
@@ -11,7 +11,7 @@
 class XTensaLX60Test(LinuxKernelTest):
 
     ASSET_DAY02 = Asset(
-        'https://www.qemu-advent-calendar.org/2018/download/day02.tar.xz',
+        'https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day02.tar.xz',
         '68ff07f9b3fd3df36d015eb46299ba44748e94bfbb2d5295fddc1a8d4a9fd324')
 
     def test_xtensa_lx60(self):
-- 
2.46.1

Re: [PATCH] tests/functional: Switch back to the gitlab URLs for the advent calendar tests

[Manos Pitsidianakis]

Hello Thomas,

On Mon, 30 Sep 2024 20:18, Thomas Huth <thuth@redhat.com> wrote:
>Shortly after we switched to the original URLs on qemu-advent-calendar.org,
>the server went offline - looks like we are better off using the gitlab
>URLs again instead.
>
>Signed-off-by: Thomas Huth <thuth@redhat.com>
>---
[snip]
>diff --git a/tests/functional/test_microblazeel_s3adsp1800.py 
>b/tests/functional/test_microblazeel_s3adsp1800.py
>index faa3927f2e..47c941d487 100755
>--- a/tests/functional/test_microblazeel_s3adsp1800.py
>+++ b/tests/functional/test_microblazeel_s3adsp1800.py
>@@ -18,8 +18,8 @@ class MicroblazeelMachine(QemuSystemTest):
>     timeout = 90
> 
>     ASSET_IMAGE = Asset(
>-        ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
>-        'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
>+        ('https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/day13.tar.xz'),
>+        '67e4c502651f8801e724ecc26403f1d0cdbc00549b033166e2e8cd14e9d49fef')
> 
>     def test_microblazeel_s3adsp1800(self):
>         self.require_netdev('user')

I downloaded both day13.tar.gz and day13.tar.xz and these archives have 
different file contents, is that on purpose?

Re: [PATCH] tests/functional: Switch back to the gitlab URLs for the advent calendar tests

[Thomas Huth]

On 01/10/2024 10.50, Manos Pitsidianakis wrote:
> Hello Thomas,
> 
> On Mon, 30 Sep 2024 20:18, Thomas Huth <thuth@redhat.com> wrote:
>> Shortly after we switched to the original URLs on qemu-advent-calendar.org,
>> the server went offline - looks like we are better off using the gitlab
>> URLs again instead.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
> [snip]
>> diff --git a/tests/functional/test_microblazeel_s3adsp1800.py b/tests/ 
>> functional/test_microblazeel_s3adsp1800.py
>> index faa3927f2e..47c941d487 100755
>> --- a/tests/functional/test_microblazeel_s3adsp1800.py
>> +++ b/tests/functional/test_microblazeel_s3adsp1800.py
>> @@ -18,8 +18,8 @@ class MicroblazeelMachine(QemuSystemTest):
>>     timeout = 90
>>
>>     ASSET_IMAGE = Asset(
>> -        ('http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
>> -        'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
>> +        ('https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/ 
>> day13.tar.xz'),
>> +        '67e4c502651f8801e724ecc26403f1d0cdbc00549b033166e2e8cd14e9d49fef')
>>
>>     def test_microblazeel_s3adsp1800(self):
>>         self.require_netdev('user')
> 
> I downloaded both day13.tar.gz and day13.tar.xz and these archives have 
> different file contents, is that on purpose?

Oh, drat! That's a different package, indeed - it's the one from 2018, not 
the one from 2023! I didn't really notice since I did not remove my 
tests/functional/ folder before re-running the tests, so this test was 
silently re-using the old binary from the previous test runs :-/
(note to myself: we should maybe remove the binaries after each test run).

Thanks for spotting it!

Meanwhile, the www.qemu-advent-calendar.org website seems to be back, so 
maybe we don't need this patch here anymore... let's wait and see whether it 
remains stable now...

  Thomas

Re: [PATCH] tests/functional: Switch back to the gitlab URLs for the advent calendar tests

[Manos Pitsidianakis]

[-- Attachment #1: Type: text/plain, Size: 2177 bytes --]

On Tue, Oct 1, 2024, 12:14 PM Thomas Huth <thuth@redhat.com> wrote:

> On 01/10/2024 10.50, Manos Pitsidianakis wrote:
> > Hello Thomas,
> >
> > On Mon, 30 Sep 2024 20:18, Thomas Huth <thuth@redhat.com> wrote:
> >> Shortly after we switched to the original URLs on
> qemu-advent-calendar.org,
> >> the server went offline - looks like we are better off using the gitlab
> >> URLs again instead.
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> > [snip]
> >> diff --git a/tests/functional/test_microblazeel_s3adsp1800.py b/tests/
> >> functional/test_microblazeel_s3adsp1800.py
> >> index faa3927f2e..47c941d487 100755
> >> --- a/tests/functional/test_microblazeel_s3adsp1800.py
> >> +++ b/tests/functional/test_microblazeel_s3adsp1800.py
> >> @@ -18,8 +18,8 @@ class MicroblazeelMachine(QemuSystemTest):
> >>     timeout = 90
> >>
> >>     ASSET_IMAGE = Asset(
> >> -        ('
> http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
> >> -
> 'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
> >> +        ('
> https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/
> >> day13.tar.xz'),
> >> +
> '67e4c502651f8801e724ecc26403f1d0cdbc00549b033166e2e8cd14e9d49fef')
> >>
> >>     def test_microblazeel_s3adsp1800(self):
> >>         self.require_netdev('user')
> >
> > I downloaded both day13.tar.gz and day13.tar.xz and these archives have
> > different file contents, is that on purpose?
>
> Oh, drat! That's a different package, indeed - it's the one from 2018, not
> the one from 2023! I didn't really notice since I did not remove my
> tests/functional/ folder before re-running the tests, so this test was
> silently re-using the old binary from the previous test runs :-/
> (note to myself: we should maybe remove the binaries after each test run).
>
> Thanks for spotting it!
>
> Meanwhile, the www.qemu-advent-calendar.org website seems to be back, so
> maybe we don't need this patch here anymore... let's wait and see whether
> it
> remains stable now...


Suggestion: Add a list of source URLs in Asset() so that it has a fallback
if the first host cannot be reached, maybe you can respin the patch to do
this?

[-- Attachment #2: Type: text/html, Size: 3521 bytes --]

Re: [PATCH] tests/functional: Switch back to the gitlab URLs for the advent calendar tests

[Daniel P. Berrangé]

On Tue, Oct 01, 2024 at 03:09:29PM +0300, Manos Pitsidianakis wrote:
> On Tue, Oct 1, 2024, 12:14 PM Thomas Huth <thuth@redhat.com> wrote:
> 
> > On 01/10/2024 10.50, Manos Pitsidianakis wrote:
> > > Hello Thomas,
> > >
> > > On Mon, 30 Sep 2024 20:18, Thomas Huth <thuth@redhat.com> wrote:
> > >> Shortly after we switched to the original URLs on
> > qemu-advent-calendar.org,
> > >> the server went offline - looks like we are better off using the gitlab
> > >> URLs again instead.
> > >>
> > >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> > >> ---
> > > [snip]
> > >> diff --git a/tests/functional/test_microblazeel_s3adsp1800.py b/tests/
> > >> functional/test_microblazeel_s3adsp1800.py
> > >> index faa3927f2e..47c941d487 100755
> > >> --- a/tests/functional/test_microblazeel_s3adsp1800.py
> > >> +++ b/tests/functional/test_microblazeel_s3adsp1800.py
> > >> @@ -18,8 +18,8 @@ class MicroblazeelMachine(QemuSystemTest):
> > >>     timeout = 90
> > >>
> > >>     ASSET_IMAGE = Asset(
> > >> -        ('
> > http://www.qemu-advent-calendar.org/2023/download/day13.tar.gz'),
> > >> -
> > 'b9b3d43c5dd79db88ada495cc6e0d1f591153fe41355e925d791fbf44de50c22')
> > >> +        ('
> > https://qemu-advcal.gitlab.io/qac-best-of-multiarch/download/
> > >> day13.tar.xz'),
> > >> +
> > '67e4c502651f8801e724ecc26403f1d0cdbc00549b033166e2e8cd14e9d49fef')
> > >>
> > >>     def test_microblazeel_s3adsp1800(self):
> > >>         self.require_netdev('user')
> > >
> > > I downloaded both day13.tar.gz and day13.tar.xz and these archives have
> > > different file contents, is that on purpose?
> >
> > Oh, drat! That's a different package, indeed - it's the one from 2018, not
> > the one from 2023! I didn't really notice since I did not remove my
> > tests/functional/ folder before re-running the tests, so this test was
> > silently re-using the old binary from the previous test runs :-/
> > (note to myself: we should maybe remove the binaries after each test run).
> >
> > Thanks for spotting it!
> >
> > Meanwhile, the www.qemu-advent-calendar.org website seems to be back, so
> > maybe we don't need this patch here anymore... let's wait and see whether
> > it
> > remains stable now...
> 
> 
> Suggestion: Add a list of source URLs in Asset() so that it has a fallback
> if the first host cannot be reached, maybe you can respin the patch to do
> this?

If the first host URL isn't reliable then we shouldn't use it at all, just
point directly to the 2nd reliable URL. If neither of the URLs are considered
reliable then we shouldn't have the test enabled at all IMHO. 

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|