From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org, Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PULL 1/3] tests/avocado: Update the URLs of the advent calendar images
Date: Wed, 23 Nov 2022 15:28:41 +0100 [thread overview]
Message-ID: <20221123142843.346105-2-thuth@redhat.com> (raw)
In-Reply-To: <20221123142843.346105-1-thuth@redhat.com>
The qemu-advent-calendar.org server will be decommissioned soon.
I've mirrored the images that we use for the QEMU CI to gitlab,
so update their URLs to point to the new location.
Message-Id: <20221121102436.78635-1-thuth@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/avocado/boot_linux_console.py | 4 +--
tests/avocado/machine_arm_canona1100.py | 4 +--
tests/avocado/machine_microblaze.py | 4 +--
tests/avocado/machine_sparc64_sun4u.py | 4 +--
tests/avocado/ppc_mpc8544ds.py | 6 ++--
tests/avocado/ppc_virtex_ml507.py | 6 ++--
tests/avocado/replay_kernel.py | 40 ++++++++++++-------------
7 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py
index 4c9d551f47..f3e6f44ae9 100644
--- a/tests/avocado/boot_linux_console.py
+++ b/tests/avocado/boot_linux_console.py
@@ -1029,8 +1029,8 @@ def test_m68k_q800(self):
self.wait_for_console_pattern(console_pattern)
def do_test_advcal_2018(self, day, tar_hash, kernel_name, console=0):
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day' + day + '.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day' + day + '.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
self.vm.set_console(console_index=console)
diff --git a/tests/avocado/machine_arm_canona1100.py b/tests/avocado/machine_arm_canona1100.py
index 182a0b0513..a42d8b0f2b 100644
--- a/tests/avocado/machine_arm_canona1100.py
+++ b/tests/avocado/machine_arm_canona1100.py
@@ -23,8 +23,8 @@ def test_arm_canona1100(self):
:avocado: tags=machine:canon-a1100
:avocado: tags=device:pflash_cfi02
"""
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day18.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day18.tar.xz')
tar_hash = '068b5fc4242b29381acee94713509f8a876e9db6'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
diff --git a/tests/avocado/machine_microblaze.py b/tests/avocado/machine_microblaze.py
index 4928920f96..8d0efff30d 100644
--- a/tests/avocado/machine_microblaze.py
+++ b/tests/avocado/machine_microblaze.py
@@ -19,8 +19,8 @@ def test_microblaze_s3adsp1800(self):
:avocado: tags=machine:petalogix-s3adsp1800
"""
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day17.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day17.tar.xz')
tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
diff --git a/tests/avocado/machine_sparc64_sun4u.py b/tests/avocado/machine_sparc64_sun4u.py
index 458165500e..d333c0ae91 100644
--- a/tests/avocado/machine_sparc64_sun4u.py
+++ b/tests/avocado/machine_sparc64_sun4u.py
@@ -24,8 +24,8 @@ def test_sparc64_sun4u(self):
:avocado: tags=arch:sparc64
:avocado: tags=machine:sun4u
"""
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day23.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day23.tar.xz')
tar_hash = '142db83cd974ffadc4f75c8a5cad5bcc5722c240'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
diff --git a/tests/avocado/ppc_mpc8544ds.py b/tests/avocado/ppc_mpc8544ds.py
index 8d6a749201..b599fb1cc9 100644
--- a/tests/avocado/ppc_mpc8544ds.py
+++ b/tests/avocado/ppc_mpc8544ds.py
@@ -22,9 +22,9 @@ def test_ppc_mpc8544ds(self):
:avocado: tags=accel:tcg
"""
self.require_accelerator("tcg")
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2020/download/day17.tar.gz')
- tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day04.tar.xz')
+ tar_hash = 'f46724d281a9f30fa892d458be7beb7d34dc25f9'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
self.vm.set_console()
diff --git a/tests/avocado/ppc_virtex_ml507.py b/tests/avocado/ppc_virtex_ml507.py
index 6b07686b56..a73f8ae396 100644
--- a/tests/avocado/ppc_virtex_ml507.py
+++ b/tests/avocado/ppc_virtex_ml507.py
@@ -22,9 +22,9 @@ def test_ppc_virtex_ml507(self):
:avocado: tags=accel:tcg
"""
self.require_accelerator("tcg")
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2020/download/hippo.tar.gz')
- tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day08.tar.xz')
+ tar_hash = '74c68f5af7a7b8f21c03097b298f3bb77ff52c1f'
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
archive.extract(file_path, self.workdir)
self.vm.set_console()
diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py
index 0b2b0dc692..00a26e4a0c 100644
--- a/tests/avocado/replay_kernel.py
+++ b/tests/avocado/replay_kernel.py
@@ -296,8 +296,8 @@ def test_arm_vexpressa9(self):
:avocado: tags=machine:vexpress-a9
"""
tar_hash = '32b7677ce8b6f1471fb0059865f451169934245b'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day16.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day16.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
dtb_path = self.workdir + '/day16/vexpress-v2p-ca9.dtb'
self.do_test_advcal_2018(file_path, 'winter.zImage',
@@ -309,8 +309,8 @@ def test_m68k_mcf5208evb(self):
:avocado: tags=machine:mcf5208evb
"""
tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day07.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day07.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'sanity-clause.elf')
@@ -321,8 +321,8 @@ def test_microblaze_s3adsp1800(self):
:avocado: tags=machine:petalogix-s3adsp1800
"""
tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day17.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day17.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'ballerina.bin')
@@ -333,8 +333,8 @@ def test_ppc64_e500(self):
:avocado: tags=cpu:e5500
"""
tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day19.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day19.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'uImage')
@@ -344,8 +344,8 @@ def test_or1k_sim(self):
:avocado: tags=machine:or1k-sim
"""
tar_hash = '20334cdaf386108c530ff0badaecc955693027dd'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day20.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day20.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'vmlinux')
@@ -355,8 +355,8 @@ def test_nios2_10m50(self):
:avocado: tags=machine:10m50-ghrd
"""
tar_hash = 'e4251141726c412ac0407c5a6bceefbbff018918'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day14.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day14.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'vmlinux.elf')
@@ -366,8 +366,8 @@ def test_ppc_g3beige(self):
:avocado: tags=machine:g3beige
"""
tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day15.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day15.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'invaders.elf',
args=('-M', 'graphics=off'))
@@ -378,8 +378,8 @@ def test_ppc_mac99(self):
:avocado: tags=machine:mac99
"""
tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day15.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day15.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'invaders.elf',
args=('-M', 'graphics=off'))
@@ -390,8 +390,8 @@ def test_sparc_ss20(self):
:avocado: tags=machine:SS-20
"""
tar_hash = 'b18550d5d61c7615d989a06edace051017726a9f'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day11.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day11.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'zImage.elf')
@@ -402,8 +402,8 @@ def test_xtensa_lx60(self):
:avocado: tags=cpu:dc233c
"""
tar_hash = '49e88d9933742f0164b60839886c9739cb7a0d34'
- tar_url = ('https://www.qemu-advent-calendar.org'
- '/2018/download/day02.tar.xz')
+ tar_url = ('https://qemu-advcal.gitlab.io'
+ '/qac-best-of-multiarch/download/day02.tar.xz')
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
self.do_test_advcal_2018(file_path, 'santas-sleigh-ride.elf')
--
2.31.1
next prev parent reply other threads:[~2022-11-23 14:29 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-23 14:28 [PULL 0/3] Avocado tests and qtests improvements Thomas Huth
2022-11-23 14:28 ` Thomas Huth [this message]
2022-11-23 14:28 ` [PULL 2/3] tests/qtest: Decrease the amount of output from the qom-test Thomas Huth
2022-11-23 14:28 ` [PULL 3/3] tests/avocado: use new rootfs for orangepi test Thomas Huth
2022-11-23 21:57 ` [PULL 0/3] Avocado tests and qtests improvements Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221123142843.346105-2-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.