From nobody Thu Apr 25 10:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669213778; cv=none; d=zohomail.com; s=zohoarc; b=efGne9+jGFBoCzD3lbn1WfB8hVz0oMgl9YBbU5v+ZnM5V4gY15UMlAeHDvJr1b9REHO7CENPJ9XDYTSqCqzCMmoTy0F+6Px5WKmtR7QGsF4kRzoPf6JF3++dGHdEf3LI+bhhWkxjjXOZdJxWVzPU2goI7icTceZGNEbiHu71Xi8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669213778; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pC3V1c3V8x9CDuL/8b3aDBtbu068BZaSB13EdXyWT9k=; b=lLQ0itt5MaVY3TJKaX3WYBaJIs1SYUCsin5TTi184kg370nn7m6v1agObIKMnMDddsDbs5wj49GZTYLOfpP2k5Jv+IkechPK3sPZkany0z0Ile99xSr+VZvVrfmxG3FfL66Ej+TDNexEihSdg4j8WA3llLSqOAYwqbbUz/HOWxY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669213778872356.7998928317495; Wed, 23 Nov 2022 06:29:38 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxqkR-0005xl-7o; Wed, 23 Nov 2022 09:29:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxqkP-0005wo-Fz for qemu-devel@nongnu.org; Wed, 23 Nov 2022 09:29:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxqkE-0007rl-G5 for qemu-devel@nongnu.org; Wed, 23 Nov 2022 09:29:09 -0500 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-631-lqkaJlHWMtmfv8eVmZQu-g-1; Wed, 23 Nov 2022 09:28:50 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id A208D882826 for ; Wed, 23 Nov 2022 14:28:49 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id 087F140C83BB; Wed, 23 Nov 2022 14:28:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669213733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pC3V1c3V8x9CDuL/8b3aDBtbu068BZaSB13EdXyWT9k=; b=Bd7JL3UxdRPB+It+fl4Epe0Pg1Gn53n4Htebi1mtoQrP5ZD33OjFvYTTrPSqgOB3gLRs6d NtJve5Z6OVwmICrvnlGX89vNXM/s32USf5oCUyfGrNFFQ/uzm9atME7ZdftaXU9307rEud bqgGt0ZppGr8ASGMpKkKUE5eFIP9U2c= X-MC-Unique: lqkaJlHWMtmfv8eVmZQu-g-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [PULL 1/3] tests/avocado: Update the URLs of the advent calendar images Date: Wed, 23 Nov 2022 15:28:41 +0100 Message-Id: <20221123142843.346105-2-thuth@redhat.com> In-Reply-To: <20221123142843.346105-1-thuth@redhat.com> References: <20221123142843.346105-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669213780588100003 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=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- 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) =20 def do_test_advcal_2018(self, day, tar_hash, kernel_name, console=3D0): - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day' + day + '.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day' + day + '.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) archive.extract(file_path, self.workdir) self.vm.set_console(console_index=3Dconsole) diff --git a/tests/avocado/machine_arm_canona1100.py b/tests/avocado/machin= e_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=3Dmachine:canon-a1100 :avocado: tags=3Ddevice:pflash_cfi02 """ - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day18.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day18.tar.xz') tar_hash =3D '068b5fc4242b29381acee94713509f8a876e9db6' file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) archive.extract(file_path, self.workdir) diff --git a/tests/avocado/machine_microblaze.py b/tests/avocado/machine_mi= croblaze.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=3Dmachine:petalogix-s3adsp1800 """ =20 - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day17.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day17.tar.xz') tar_hash =3D '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f' file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_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=3Darch:sparc64 :avocado: tags=3Dmachine:sun4u """ - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day23.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day23.tar.xz') tar_hash =3D '142db83cd974ffadc4f75c8a5cad5bcc5722c240' file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_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=3Daccel:tcg """ self.require_accelerator("tcg") - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2020/download/day17.tar.gz') - tar_hash =3D '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494' + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day04.tar.xz') + tar_hash =3D 'f46724d281a9f30fa892d458be7beb7d34dc25f9' file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_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_m= l507.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=3Daccel:tcg """ self.require_accelerator("tcg") - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2020/download/hippo.tar.gz') - tar_hash =3D '306b95bfe7d147f125aa176a877e266db8ef914a' + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day08.tar.xz') + tar_hash =3D '74c68f5af7a7b8f21c03097b298f3bb77ff52c1f' file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_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=3Dmachine:vexpress-a9 """ tar_hash =3D '32b7677ce8b6f1471fb0059865f451169934245b' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day16.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day16.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) dtb_path =3D 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=3Dmachine:mcf5208evb """ tar_hash =3D 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day07.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day07.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'sanity-clause.elf') =20 @@ -321,8 +321,8 @@ def test_microblaze_s3adsp1800(self): :avocado: tags=3Dmachine:petalogix-s3adsp1800 """ tar_hash =3D '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day17.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day17.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'ballerina.bin') =20 @@ -333,8 +333,8 @@ def test_ppc64_e500(self): :avocado: tags=3Dcpu:e5500 """ tar_hash =3D '6951d86d644b302898da2fd701739c9406527fe1' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day19.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day19.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'uImage') =20 @@ -344,8 +344,8 @@ def test_or1k_sim(self): :avocado: tags=3Dmachine:or1k-sim """ tar_hash =3D '20334cdaf386108c530ff0badaecc955693027dd' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day20.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day20.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'vmlinux') =20 @@ -355,8 +355,8 @@ def test_nios2_10m50(self): :avocado: tags=3Dmachine:10m50-ghrd """ tar_hash =3D 'e4251141726c412ac0407c5a6bceefbbff018918' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day14.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day14.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'vmlinux.elf') =20 @@ -366,8 +366,8 @@ def test_ppc_g3beige(self): :avocado: tags=3Dmachine:g3beige """ tar_hash =3D 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day15.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day15.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'invaders.elf', args=3D('-M', 'graphics=3Doff')) @@ -378,8 +378,8 @@ def test_ppc_mac99(self): :avocado: tags=3Dmachine:mac99 """ tar_hash =3D 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day15.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day15.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'invaders.elf', args=3D('-M', 'graphics=3Doff')) @@ -390,8 +390,8 @@ def test_sparc_ss20(self): :avocado: tags=3Dmachine:SS-20 """ tar_hash =3D 'b18550d5d61c7615d989a06edace051017726a9f' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day11.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day11.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'zImage.elf') =20 @@ -402,8 +402,8 @@ def test_xtensa_lx60(self): :avocado: tags=3Dcpu:dc233c """ tar_hash =3D '49e88d9933742f0164b60839886c9739cb7a0d34' - tar_url =3D ('https://www.qemu-advent-calendar.org' - '/2018/download/day02.tar.xz') + tar_url =3D ('https://qemu-advcal.gitlab.io' + '/qac-best-of-multiarch/download/day02.tar.xz') file_path =3D self.fetch_asset(tar_url, asset_hash=3Dtar_hash) self.do_test_advcal_2018(file_path, 'santas-sleigh-ride.elf') =20 --=20 2.31.1 From nobody Thu Apr 25 10:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669213769; cv=none; d=zohomail.com; s=zohoarc; b=W6cdIsRU89+R+kxx/9U2Xt+mvf12nlq3L+cRAEGFv8zeO2g+GNP1XsZgGOR6x6QsAu6Lleg5o8vi8ky7la6vonGI4IAHY9gkE0fQ6M2xJreqfX+QubLxGfKVNPvZtNP4M7BLQtKHD5f76iW4Vy7ae3voV/uvN1ra8X1eVD0tiB0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669213769; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cpGjHrUGnJAcBs1eKHwv8KY1P3+7Nhik4Fde+09rjnY=; b=NZcZ8/tUSpjR4Y+GYBDa3RMtF6tHTa1LQiHFUxO8IUV9dqtbiKYiQUURu6W1S9jQ7IuxWGgsAlOigD6GeUgk46+NvuXt72nrbQN5IEOW6BFz+6umXVXPB5nHHWZ4kJCNxYLC6cK4Xzhj+he0IMLIu1jS+/VpdXdcUuKw1N08t1g= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669213769407365.1265346960307; Wed, 23 Nov 2022 06:29:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxqkM-0005uj-DB; Wed, 23 Nov 2022 09:29:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxqkL-0005sM-Hv for qemu-devel@nongnu.org; Wed, 23 Nov 2022 09:29:05 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxqkF-0007rh-1X for qemu-devel@nongnu.org; Wed, 23 Nov 2022 09:29:05 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-210-GGYyOt4PM02M-EZ-Q15kFA-1; Wed, 23 Nov 2022 09:28:50 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 902ED1C0879D for ; Wed, 23 Nov 2022 14:28:50 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id E666740C2086; Wed, 23 Nov 2022 14:28:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669213732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cpGjHrUGnJAcBs1eKHwv8KY1P3+7Nhik4Fde+09rjnY=; b=JP9esMDLE3WpnrZ7vtXWnlxQXaK7jgXBtzLupCx4XpchP7ziJ8eiRGPg7qtQ3drJF/NjCm sGXuHQFLU1/RC3Wk28taXmBtLAkhCknt4hb91rN0fMyI0gvgj4MABMD6oIWmHepDhAaW8w DDkK81DdEFT/EvrHLBgDOZnBq2dN/Yc= X-MC-Unique: GGYyOt4PM02M-EZ-Q15kFA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [PULL 2/3] tests/qtest: Decrease the amount of output from the qom-test Date: Wed, 23 Nov 2022 15:28:42 +0100 Message-Id: <20221123142843.346105-3-thuth@redhat.com> In-Reply-To: <20221123142843.346105-1-thuth@redhat.com> References: <20221123142843.346105-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669213770552100006 Content-Type: text/plain; charset="utf-8" The logs in the gitlab-CI have a size constraint, and sometimes we already hit this limit. The biggest part of the log then seems to be filled by the qom-test, so we should decrease the size of the output - which can be done easily by not printing the path for each property, since the path has already been logged at the beginning of each node that we handle here. However, if we omit the path, we should make sure to not recurse into child nodes in between, so that it is clear to which node each property belongs. Thus store the children and links in a temporary list and recurse only at the end of each node, when all properties have already been printed. Message-Id: <20221121194240.149268-1-thuth@redhat.com> Reviewed-by: Stefan Hajnoczi Signed-off-by: Thomas Huth --- tests/qtest/qom-test.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/tests/qtest/qom-test.c b/tests/qtest/qom-test.c index 7b871b2a31..13510bc349 100644 --- a/tests/qtest/qom-test.c +++ b/tests/qtest/qom-test.c @@ -20,6 +20,7 @@ static void test_properties(QTestState *qts, const char *= path, bool recurse) QDict *response, *tuple, *tmp; QList *list; QListEntry *entry; + GSList *children =3D NULL, *links =3D NULL; =20 g_test_message("Obtaining properties of %s", path); response =3D qtest_qmp(qts, "{ 'execute': 'qom-list'," @@ -41,11 +42,14 @@ static void test_properties(QTestState *qts, const char= *path, bool recurse) if (is_child || is_link) { child_path =3D g_strdup_printf("%s/%s", path, qdict_get_str(tuple, "name"= )); - test_properties(qts, child_path, is_child); - g_free(child_path); + if (is_child) { + children =3D g_slist_prepend(children, child_path); + } else { + links =3D g_slist_prepend(links, child_path); + } } else { const char *prop =3D qdict_get_str(tuple, "name"); - g_test_message("Testing property %s.%s", path, prop); + g_test_message("-> %s", prop); tmp =3D qtest_qmp(qts, "{ 'execute': 'qom-get'," " 'arguments': { 'path': %s, 'property': %s }= }", @@ -55,6 +59,18 @@ static void test_properties(QTestState *qts, const char = *path, bool recurse) qobject_unref(tmp); } } + + while (links) { + test_properties(qts, links->data, false); + g_free(links->data); + links =3D g_slist_delete_link(links, links); + } + while (children) { + test_properties(qts, children->data, true); + g_free(children->data); + children =3D g_slist_delete_link(children, children); + } + qobject_unref(response); } =20 --=20 2.31.1 From nobody Thu Apr 25 10:02:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669213769; cv=none; d=zohomail.com; s=zohoarc; b=AxlWX3B9P46K01ZvuiNxhIx6L9cfZ6H9W80DAM9L/EPNZM4RZwkPjs4+HpHtKBuk/rXizaaLzO2MN/jn34LDtgN6g8Vf+PwoKC+DtPfbo3RJLiswes5Mg88AehlLVZ4ltwg1dS5Rp6j7Mkg0khhYjAGMROh5VgTe01K15VJbVWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669213769; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3fwo2+7/sIak6WUZZIyi/ZLxQbM4Y0xpeLeo41+sARA=; b=Igb6nvqmW/XcpcChmGkhBkMwhv2pD15NbSiajIs/cuL47ZpQdSVI9+2HyP5KHaXCzjzgxa0fQ5NIFSIBCAbUjMBpXB1T4t0swPNEvhC8zWh4c3E5d7+19ETJr41VHQFQZ2ghy03/JkvIbpyU9q2RVEfy4jSAdotuT2CnWaqFkMM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1669213769258638.7837728396421; Wed, 23 Nov 2022 06:29:29 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxqkP-0005wl-C6; Wed, 23 Nov 2022 09:29:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxqkM-0005un-Es for qemu-devel@nongnu.org; Wed, 23 Nov 2022 09:29:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxqkE-0007rp-Me for qemu-devel@nongnu.org; Wed, 23 Nov 2022 09:29:06 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-314-D2mfpdfUM7mo1rc6U7tsxA-1; Wed, 23 Nov 2022 09:28:52 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 85B1138173D2 for ; Wed, 23 Nov 2022 14:28:51 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.97]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF65640C83BB; Wed, 23 Nov 2022 14:28:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669213733; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3fwo2+7/sIak6WUZZIyi/ZLxQbM4Y0xpeLeo41+sARA=; b=he/eiumWdkgpdqIbq7zBAIEEHOYHgfz2N28wWbCNwInQRXVjW7Ox0ZbemDMvW6fSfNVcJr DHVX36TIOpYIPTnRM8iFu6QJiTskTEmO8Sj1OrrAQZCRWUO1HVMcPdenv48vTpb2BiKVWY hOtwIj6aBxgroaJdRW7mUPbMXIy9qJ4= X-MC-Unique: D2mfpdfUM7mo1rc6U7tsxA-1 From: Thomas Huth To: qemu-devel@nongnu.org, Stefan Hajnoczi Subject: [PULL 3/3] tests/avocado: use new rootfs for orangepi test Date: Wed, 23 Nov 2022 15:28:43 +0100 Message-Id: <20221123142843.346105-4-thuth@redhat.com> In-Reply-To: <20221123142843.346105-1-thuth@redhat.com> References: <20221123142843.346105-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1669213770540100005 From: Alex Benn=C3=A9e The old URL wasn't stable. I suspect the current URL will only be stable for a few months so maybe we need another strategy for hosting rootfs snapshots? Signed-off-by: Alex Benn=C3=A9e Message-Id: <20221118113309.1057790-1-alex.bennee@linaro.org> Signed-off-by: Thomas Huth --- tests/avocado/boot_linux_console.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index f3e6f44ae9..ec07c64291 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -793,8 +793,8 @@ def test_arm_orangepi_sd(self): dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi= -pc.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) rootfs_url =3D ('http://storage.kernelci.org/images/rootfs/buildro= ot/' - 'kci-2019.02/armel/base/rootfs.ext2.xz') - rootfs_hash =3D '692510cb625efda31640d1de0a8d60e26040f061' + 'buildroot-baseline/20221116.0/armel/rootfs.ext2.xz') + rootfs_hash =3D 'fae32f337c7b87547b10f42599acf109da8b6d9a' rootfs_path_xz =3D self.fetch_asset(rootfs_url, asset_hash=3Drootf= s_hash) rootfs_path =3D os.path.join(self.workdir, 'rootfs.cpio') archive.lzma_uncompress(rootfs_path_xz, rootfs_path) --=20 2.31.1