From nobody Thu May 16 15:59:04 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1713194378; cv=none; d=zohomail.com; s=zohoarc; b=AC9GCEk6dfyz1XqIjQbnYkFpXN8lpalFTL2mEBOoc1gaFsDAGdOMqTkhhWa8vrladmIdA7EjCkNMrXtEvh4QKdaH9I3RpkPKMj7ZiXdHo/PlS/rWCZocv4pR2ImCZl6p2wABWfnuydlhgARSMLeFk5Ce0TJm3KAAS6vJ/ZMmbqQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1713194378; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ym3EZJbJl0gm6jPMdSsVldV1r8b8PwCAMdNAgUyaFS8=; b=F94tlNbOh0LPvMhz+r4bB2tUtofq4KPCbtigH8/5RNHyJfqtdqe5r/Osc8vs4rjaJ8NqEK7ypWCl9VHTkzLbrdgFK5RhQFpbC3o79g/mn/pfXKvqOOvLPvTDS2bRlAqdODP2XzKONeXi+AuA9JFE1lNHve+0kL6DhiAjzQ8GiLc= 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 1713194378842630.1387508034653; Mon, 15 Apr 2024 08:19:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwO6f-00023K-Tx; Mon, 15 Apr 2024 11:18:53 -0400 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 1rwO6d-00020y-41 for qemu-devel@nongnu.org; Mon, 15 Apr 2024 11:18:51 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rwO6a-0006f6-PH for qemu-devel@nongnu.org; Mon, 15 Apr 2024 11:18:50 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-41884e96fe0so1042975e9.0 for ; Mon, 15 Apr 2024 08:18:48 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id w5-20020a5d4045000000b00346ceb9e060sm11546672wrp.103.2024.04.15.08.18.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 08:18:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713194327; x=1713799127; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ym3EZJbJl0gm6jPMdSsVldV1r8b8PwCAMdNAgUyaFS8=; b=Qsan/htadBB4kZFjCbj23cbWN2JCoy29EW0md+NxcPvaQDMycUcJl6wZVe72ua6V9G 6yHXGviP2LMMqg+2B9tclX0VFHNrS2GrXTNlTCLWZgkqQ8erGGCeIcE/XBnweGgWp3os 3jzXLsBQUfE6Y53un7N3Mp6237TlOteU6e31Kz/CyluaMIB2U/X1oLIjYg3n9Pr8iUQu oM59U3haGVmyvgaOopVt6zptDYrEB1B2fJHGCjXwFYQPfPFcZv0N+mBsa0TtdGR18VKE jRI94+ETdraB0+9ryUBIks4Db92Da2hVJO/RCIODwjNO+gA42N5+ls9k2UAIgAstCHpk XmFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713194327; x=1713799127; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ym3EZJbJl0gm6jPMdSsVldV1r8b8PwCAMdNAgUyaFS8=; b=qWpl/MnjYvRVHF9ncbHm/BO0aUUkAMwccmoq48oNFjmewy84p0K1HZ1zoTruDCWska xMXqklj9YgxKgOo6LKTkYwcXo45bNDayAtF3B1DtkTfjWo19y/cwbt7AIg05UB8cbkA8 x9Wg45rnf9t65X4AUiEg9VY39FFSK0tW/RnUzSPww1sa9v1JqxaOAWr8QpG2GVH3ztJV YAuIoExRMB2WbonZUCYqZ0t/iNNbt2PZumqPNlRdyQ/6TtPgshhYMfsDFyaKo+aI47Uo Bha/xQ3PDhhrhCS35S2VKiDmIj3hXsA2fcIDNH7zV/4yvZMXos23lFGJjlVWbOL78jw3 iNgA== X-Forwarded-Encrypted: i=1; AJvYcCU9ASE0+48mQJq0GJposEi9oHc9xdHgtGQv6+jKVKpGi3PPV1BzxSZUnIMdvM/+Zlkit1QQ6fHFNjFLJ4JpJ2pbE/O6Muw= X-Gm-Message-State: AOJu0YzyUF4LAFcOoyqgU+btXyzdWqpRmTenbxRTOrn93hQ1w/1u6uzp jEgFx4EDfy7myC8g7wfNEgO4wkYNSuPJi+Wf+4RqqPKigGZzXCWZpz5bFkayjIk= X-Google-Smtp-Source: AGHT+IFfsEm4mxE6RBUHOV7RvR10FdVlSw85w7ZZz2qC5I6b5f9FJI+RBc8UPYkqb21Z+gAGRP6jpA== X-Received: by 2002:a5d:457c:0:b0:343:6b09:7551 with SMTP id a28-20020a5d457c000000b003436b097551mr5954148wrc.38.1713194326989; Mon, 15 Apr 2024 08:18:46 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PATCH] tests/avocado: update sunxi kernel from armbian to 6.6.16 Date: Mon, 15 Apr 2024 16:18:45 +0100 Message-Id: <20240415151845.1564201-1-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 @linaro.org) X-ZM-MESSAGEID: 1713194380942100003 Content-Type: text/plain; charset="utf-8" The Linux kernel 5.10.16 binary for sunxi has been removed from apt.armbian.com. This means that the avocado tests for these machines will be skipped (status CANCEL) if the old binary isn't present in the avocado cache. Update to 6.6.16, in the same way we did in commit e384db41d8661 when we moved to 5.10.16 in 2021. Cc: qemu-stable@nongnu.org Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2284 Signed-off-by: Peter Maydell Reviewed-by: Niek Linnenbank Reviewed-by: Strahinja Jankovic Tested-by: Niek Linnenbank --- At this point in the release cycle I don't think I really want to put this into 9.0, though I could just about squeeze it in. cc'ing stable as an FYI -- since the tests fall back to the CANCEL status this doesn't break CI, so it's not a requirement to backport to any stable branches. But it would probably be preferable to get the coverage back on the stable branches so we can detect if we get something wrong on a backport of a patch that affects these machines. --- tests/avocado/boot_linux_console.py | 70 ++++++++++++++--------------- tests/avocado/replay_kernel.py | 8 ++-- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux= _console.py index 989b65111c0..d0ab5aaa83a 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -646,12 +646,12 @@ def test_arm_cubieboard_initrd(self): :avocado: tags=3Daccel:tcg """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') - deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' + 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') + deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-5.10.16-sunxi') - dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubiebo= ard.dtb' + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun4i-a10-= cubieboard.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' @@ -690,12 +690,12 @@ def test_arm_cubieboard_sata(self): :avocado: tags=3Daccel:tcg """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') - deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' + 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') + deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-5.10.16-sunxi') - dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubiebo= ard.dtb' + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun4i-a10-= cubieboard.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) rootfs_url =3D ('https://github.com/groeck/linux-build-test/raw/' '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' @@ -872,13 +872,13 @@ def test_arm_bpim2u(self): :avocado: tags=3Dmachine:bpim2u :avocado: tags=3Daccel:tcg """ - deb_url =3D ('https://apt.armbian.com/pool/main/l/linux-5.10.16-su= nxi/' - 'linux-image-current-sunxi_21.02.2_armhf.deb') - deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' + deb_url =3D ('https://apt.armbian.com/pool/main/l/' + 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') + deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-5.10.16-sunxi') - dtb_path =3D ('/usr/lib/linux-image-current-sunxi/' + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D ('/usr/lib/linux-image-6.6.16-current-sunxi/' 'sun8i-r40-bananapi-m2-ultra.dtb') dtb_path =3D self.extract_from_deb(deb_path, dtb_path) =20 @@ -899,13 +899,13 @@ def test_arm_bpim2u_initrd(self): :avocado: tags=3Daccel:tcg :avocado: tags=3Dmachine:bpim2u """ - deb_url =3D ('https://apt.armbian.com/pool/main/l/linux-5.10.16-su= nxi/' - 'linux-image-current-sunxi_21.02.2_armhf.deb') - deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' + deb_url =3D ('https://apt.armbian.com/pool/main/l/' + 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') + deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-5.10.16-sunxi') - dtb_path =3D ('/usr/lib/linux-image-current-sunxi/' + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D ('/usr/lib/linux-image-6.6.16-current-sunxi/' 'sun8i-r40-bananapi-m2-ultra.dtb') dtb_path =3D self.extract_from_deb(deb_path, dtb_path) initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' @@ -946,13 +946,13 @@ def test_arm_bpim2u_gmac(self): """ self.require_netdev('user') =20 - deb_url =3D ('https://apt.armbian.com/pool/main/l/linux-5.10.16-su= nxi/' - 'linux-image-current-sunxi_21.02.2_armhf.deb') - deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' + deb_url =3D ('https://apt.armbian.com/pool/main/l/' + 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') + deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-5.10.16-sunxi') - dtb_path =3D ('/usr/lib/linux-image-current-sunxi/' + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D ('/usr/lib/linux-image-6.6.16-current-sunxi/' 'sun8i-r40-bananapi-m2-ultra.dtb') dtb_path =3D self.extract_from_deb(deb_path, dtb_path) rootfs_url =3D ('http://storage.kernelci.org/images/rootfs/buildro= ot/' @@ -1049,12 +1049,12 @@ def test_arm_orangepi(self): :avocado: tags=3Daccel:tcg """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') - deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' + 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') + deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-5.10.16-sunxi') - dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi= -pc.dtb' + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-o= rangepi-pc.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) =20 self.vm.set_console() @@ -1075,12 +1075,12 @@ def test_arm_orangepi_initrd(self): :avocado: tags=3Dmachine:orangepi-pc """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') - deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' + 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') + deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-5.10.16-sunxi') - dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi= -pc.dtb' + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-o= rangepi-pc.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' @@ -1121,12 +1121,12 @@ def test_arm_orangepi_sd(self): self.require_netdev('user') =20 deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') - deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' + 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') + deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-5.10.16-sunxi') - dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi= -pc.dtb' + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun8i-h3-o= rangepi-pc.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) rootfs_url =3D ('http://storage.kernelci.org/images/rootfs/buildro= ot/' 'buildroot-baseline/20221116.0/armel/rootfs.ext2.xz') diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py index 10d99403a4c..0474f7b7c8e 100644 --- a/tests/avocado/replay_kernel.py +++ b/tests/avocado/replay_kernel.py @@ -203,12 +203,12 @@ def test_arm_cubieboard_initrd(self): :avocado: tags=3Dmachine:cubieboard """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') - deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' + 'linux-6.6.16/linux-image-current-sunxi_24.2.1_armhf__6= .6.16-Seb3e-D6b4a-P2359-Ce96bHfe66-HK01ba-V014b-B067e-R448a.deb') + deb_hash =3D 'f7c3c8c5432f765445dc6e7eab02f3bbe668256b' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-5.10.16-sunxi') - dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubiebo= ard.dtb' + '/boot/vmlinuz-6.6.16-current-= sunxi') + dtb_path =3D '/usr/lib/linux-image-6.6.16-current-sunxi/sun4i-a10-= cubieboard.dtb' dtb_path =3D self.extract_from_deb(deb_path, dtb_path) initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' --=20 2.34.1