From nobody Fri May 17 07:55:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614890460; cv=none; d=zohomail.com; s=zohoarc; b=XNCsCy0xQdqPO0WvwfwMxH9Jr2FuUGFrXpamLTsMzcF8uFi2Rge3Etpe8YlN/oCHGO1UJXvk33yFRCM5dMJ86LOHtHNMjrbWeQu1Z/Cgre1vG8w/HTclPMrcRA5I4hXThfk5OGLM9w2IrE/UwQUsmHZe7uNmtSs+AUcQ8qIi5FA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614890460; h=Content-Type:Content-Transfer-Encoding:Cc: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=kFj03blwbcM66TuxYye9XnlpLa3NkLZCnKGhAwTXsCo=; b=ZSlsTJTi1dh6tgMj5735609+Rry/6pQefDB3I3WNTs6ssL2h+MssYkULS/9r/1vPhKlrfz2k9PgyK97lEqXO4Jx4fZ+MEk1PJoxF1vB9KsxGUCcDmn1qUXO7RS9zm2G0iD/QcT1AMduEEwbl4r+bLtRS5p/4kUVx3WQLpF550Ic= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614890460487269.94535196496213; Thu, 4 Mar 2021 12:41:00 -0800 (PST) Received: from localhost ([::1]:35646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHumJ-00066z-EZ for importer@patchew.org; Thu, 04 Mar 2021 15:40:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32856) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHuhW-0001g1-6X; Thu, 04 Mar 2021 15:36:03 -0500 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:40222) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHuhQ-0005Jl-8i; Thu, 04 Mar 2021 15:36:01 -0500 Received: by mail-ej1-x634.google.com with SMTP id ci14so32985748ejc.7; Thu, 04 Mar 2021 12:35:55 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-ebf2-7b2-6f3d-5954.fixed6.kpn.net. [2a02:a456:6be8:1:ebf2:7b2:6f3d:5954]) by smtp.gmail.com with ESMTPSA id t8sm289956edv.16.2021.03.04.12.35.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 12:35:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kFj03blwbcM66TuxYye9XnlpLa3NkLZCnKGhAwTXsCo=; b=ZPNU1XIveNLCQj0m/Hv+rSR2fxKvOhEBf9TpxLzoTgeWfhh/iEUTuGmr4IdNBW56KH ZtEAkXGB5X5x0yDOEXIYpdnBQUCgiyR4bRzrSbc3jMsNVdxe4T+AspNbavIXOaggwOOC yrZqFGNFFy1ayd8hQUwayCLSTV7rT4XonFBsYgJ7o26R8GwfnAOXG1obmdYiPWaSNreu 7n71stLpGfZvXrtgcgxUADR4iH0qGJCrZX1CsiW2bRr0epGjSgF87S9JRSm/NddtUziw EMbMgG5bAXhcb1JcRTVzQlMOo5hfkRlK7CK1YI8Ey7c5gNdU/xWZrMEFPnYQU/LwzeYp DKrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kFj03blwbcM66TuxYye9XnlpLa3NkLZCnKGhAwTXsCo=; b=eHVJfYe/kRWgZ5iFxUBPGA8MsAZ9mI+BkY97+BfebD1H6JG1x8+pvfygHl628Y0bvU MBp9CawVWbVDzpVyFvOiMpIQdEeaL/G8715lcjoBXspQF6zoKzK2lY/Q0t/EhXjYIimc LbcbMz8nUs5DmHReizdLdGghPYD4TNb+ebINfkkL8rUxSZLucf1hy12ACgzgUs+t/fe8 4vZmPVMveMreD5cl4178MR+8UTibRIkYM9JNxqX9dcloAEWvuhMQyVxg18oZdBX/Fasd Ll7vqnj4vurcfSid32Cv30rHww7p4vfHH/hq711cF0p8ditQF4GACXUldQxNHAADWzRg JqVQ== X-Gm-Message-State: AOAM530z6468y2Pz0FJANTFxno3Xb1MJI/++KG2ZqPLAn2mzAQ9rzu6e E+EHDBNHsZDxwvQwueCqEZqhVO91VAsX3w== X-Google-Smtp-Source: ABdhPJx1u2pOp5Hm9SEKoNfc+tVXeqm+9U8M/A23G9McmeWk0f/aZNhH3j6/Zp0GCwgCc55gqhOImw== X-Received: by 2002:a17:906:32da:: with SMTP id k26mr4740008ejk.483.1614890154363; Thu, 04 Mar 2021 12:35:54 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 1/5] hw/net/allwinner-sun8i-emac: traverse transmit queue using TX_CUR_DESC register value Date: Thu, 4 Mar 2021 21:35:36 +0100 Message-Id: <20210304203540.41614-2-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210304203540.41614-1-nieklinnenbank@gmail.com> References: <20210304203540.41614-1-nieklinnenbank@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::634; envelope-from=nieklinnenbank@gmail.com; helo=mail-ej1-x634.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, FREEMAIL_FROM=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Currently the emulated EMAC for sun8i always traverses the transmit queue from the head when transferring packets. It searches for a list of consecut= ive descriptors whichs are flagged as ready for processing and transmits their = payloads accordingly. The controller stops processing once it finds a descriptor tha= t is not marked ready. While the above behaviour works in most situations, it is not the same as t= he actual EMAC in hardware. Actual hardware uses the TX_CUR_DESC register value to ke= ep track of the last position in the transmit queue and continues processing from th= at position when software triggers the start of DMA processing. The currently emulated = behaviour can lead to packet loss on transmit when software fills the transmit queue with= ready descriptors that overlap the tail of the circular list. This commit modifies the emulated EMAC for sun8i such that it processes the transmit queue using the TX_CUR_DESC register in the same way as hardwa= re. Signed-off-by: Niek Linnenbank Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/net/allwinner-sun8i-emac.c | 58 +++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/hw/net/allwinner-sun8i-emac.c b/hw/net/allwinner-sun8i-emac.c index 042768922c..e586c147e5 100644 --- a/hw/net/allwinner-sun8i-emac.c +++ b/hw/net/allwinner-sun8i-emac.c @@ -339,35 +339,40 @@ static void allwinner_sun8i_emac_update_irq(AwSun8iEm= acState *s) qemu_set_irq(s->irq, (s->int_sta & s->int_en) !=3D 0); } =20 -static uint32_t allwinner_sun8i_emac_next_desc(AwSun8iEmacState *s, - FrameDescriptor *desc, - size_t min_size) +static bool allwinner_sun8i_emac_desc_owned(FrameDescriptor *desc, + size_t min_buf_size) { - uint32_t paddr =3D desc->next; + return (desc->status & DESC_STATUS_CTL) && (min_buf_size =3D=3D 0 || + (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >=3D min_buf_size); +} =20 - dma_memory_read(&s->dma_as, paddr, desc, sizeof(*desc)); +static void allwinner_sun8i_emac_get_desc(AwSun8iEmacState *s, + FrameDescriptor *desc, + uint32_t phys_addr) +{ + dma_memory_read(&s->dma_as, phys_addr, desc, sizeof(*desc)); +} =20 - if ((desc->status & DESC_STATUS_CTL) && - (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >=3D min_size) { - return paddr; - } else { - return 0; - } +static uint32_t allwinner_sun8i_emac_next_desc(AwSun8iEmacState *s, + FrameDescriptor *desc) +{ + const uint32_t nxt =3D desc->next; + allwinner_sun8i_emac_get_desc(s, desc, nxt); + return nxt; } =20 -static uint32_t allwinner_sun8i_emac_get_desc(AwSun8iEmacState *s, - FrameDescriptor *desc, - uint32_t start_addr, - size_t min_size) +static uint32_t allwinner_sun8i_emac_find_desc(AwSun8iEmacState *s, + FrameDescriptor *desc, + uint32_t start_addr, + size_t min_size) { uint32_t desc_addr =3D start_addr; =20 /* Note that the list is a cycle. Last entry points back to the head. = */ while (desc_addr !=3D 0) { - dma_memory_read(&s->dma_as, desc_addr, desc, sizeof(*desc)); + allwinner_sun8i_emac_get_desc(s, desc, desc_addr); =20 - if ((desc->status & DESC_STATUS_CTL) && - (desc->status2 & DESC_STATUS2_BUF_SIZE_MASK) >=3D min_size) { + if (allwinner_sun8i_emac_desc_owned(desc, min_size)) { return desc_addr; } else if (desc->next =3D=3D start_addr) { break; @@ -383,14 +388,14 @@ static uint32_t allwinner_sun8i_emac_rx_desc(AwSun8iE= macState *s, FrameDescriptor *desc, size_t min_size) { - return allwinner_sun8i_emac_get_desc(s, desc, s->rx_desc_curr, min_siz= e); + return allwinner_sun8i_emac_find_desc(s, desc, s->rx_desc_curr, min_si= ze); } =20 static uint32_t allwinner_sun8i_emac_tx_desc(AwSun8iEmacState *s, - FrameDescriptor *desc, - size_t min_size) + FrameDescriptor *desc) { - return allwinner_sun8i_emac_get_desc(s, desc, s->tx_desc_head, min_siz= e); + allwinner_sun8i_emac_get_desc(s, desc, s->tx_desc_curr); + return s->tx_desc_curr; } =20 static void allwinner_sun8i_emac_flush_desc(AwSun8iEmacState *s, @@ -470,7 +475,8 @@ static ssize_t allwinner_sun8i_emac_receive(NetClientSt= ate *nc, bytes_left -=3D desc_bytes; =20 /* Move to the next descriptor */ - s->rx_desc_curr =3D allwinner_sun8i_emac_next_desc(s, &desc, 64); + s->rx_desc_curr =3D allwinner_sun8i_emac_find_desc(s, &desc, desc.= next, + AW_SUN8I_EMAC_MIN= _PKT_SZ); if (!s->rx_desc_curr) { /* Not enough buffer space available */ s->int_sta |=3D INT_STA_RX_BUF_UA; @@ -495,10 +501,10 @@ static void allwinner_sun8i_emac_transmit(AwSun8iEmac= State *s) size_t transmitted =3D 0; static uint8_t packet_buf[2048]; =20 - s->tx_desc_curr =3D allwinner_sun8i_emac_tx_desc(s, &desc, 0); + s->tx_desc_curr =3D allwinner_sun8i_emac_tx_desc(s, &desc); =20 /* Read all transmit descriptors */ - while (s->tx_desc_curr !=3D 0) { + while (allwinner_sun8i_emac_desc_owned(&desc, 0)) { =20 /* Read from physical memory into packet buffer */ bytes =3D desc.status2 & DESC_STATUS2_BUF_SIZE_MASK; @@ -524,7 +530,7 @@ static void allwinner_sun8i_emac_transmit(AwSun8iEmacSt= ate *s) packet_bytes =3D 0; transmitted++; } - s->tx_desc_curr =3D allwinner_sun8i_emac_next_desc(s, &desc, 0); + s->tx_desc_curr =3D allwinner_sun8i_emac_next_desc(s, &desc); } =20 /* Raise transmit completed interrupt */ --=20 2.25.1 From nobody Fri May 17 07:55:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614890628; cv=none; d=zohomail.com; s=zohoarc; b=fJFMMH6mEhwYdiJyHSh3y9XD5KviuGD43sg8e4LF6BiWUEmc0wogzrwUE6jB6ndVPju9wYj8PpY0R9Y+F5C6Itc0wuZiZVkmUd1L9O1Qz3//IJ5LVw7yBaMnr/bbk4uquSX/h03TK6IRhdc3eHnQbEtOdRzyo9C6Zb8Is/+jNLA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614890628; h=Content-Transfer-Encoding:Cc: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=eX+StC+s06++yjOppbmGqXt7Tl26dHtgKxlBKwffk6k=; b=ix1dykuRn4xz44Pj3ZfbPFr5JRBMa+UrI+pYMQ9RN3Lwyip8uq59QL5RWorD41jgAnnmefSAwvBp7Soihmz7PLuetKZEv29DPxW8A55JPGnm+wSEdsGUCQotorgQd9JbSSZAVcFMZWepDJql0T+8C0qMQcMCYhJTud/IvxZqpcg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614890628185735.783443706502; Thu, 4 Mar 2021 12:43:48 -0800 (PST) Received: from localhost ([::1]:44120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHup0-0001Ig-FF for importer@patchew.org; Thu, 04 Mar 2021 15:43:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHuhZ-0001hV-0a; Thu, 04 Mar 2021 15:36:05 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:34735) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHuhR-0005Kt-HT; Thu, 04 Mar 2021 15:36:03 -0500 Received: by mail-ej1-x636.google.com with SMTP id hs11so52058053ejc.1; Thu, 04 Mar 2021 12:35:56 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-ebf2-7b2-6f3d-5954.fixed6.kpn.net. [2a02:a456:6be8:1:ebf2:7b2:6f3d:5954]) by smtp.gmail.com with ESMTPSA id t8sm289956edv.16.2021.03.04.12.35.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 12:35:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eX+StC+s06++yjOppbmGqXt7Tl26dHtgKxlBKwffk6k=; b=Pa91D94f0Ro9q7tplrIFam76VZ6YeYlC/qnBuLC1UqswZxg0YPzHYkDv8rGav1Oh4e WIXNXReBjACXXFCImrj/ATlTxQjuoPfJaWI+iRO5+PsXrtS+56vZkF176VpMvIFclsjG ykAp3HgcP1DixRegwDtQ3anlQQb7eCxDs8btY2ejsTVvINKK8vmXgORvG1IHFZ9KQO24 bGbyd9YWoxgPa6iDTQdQurdSPZhNh958hN7H7t0HlDakh3RB7GhaF6fGl6kzQNoOK2lc WHxlNBPf4yEBFpXQKtnwiEXPWabtKQ2PynYSfO5m5xD8kjm77JCM/w6OJfMS4LERL75g Krsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eX+StC+s06++yjOppbmGqXt7Tl26dHtgKxlBKwffk6k=; b=IwNzS4G8AITZn2ZZ5SfWFHlhTlpSQjY6BB8HKKEmgP2DyylCnBI1lMhFRzOiHxHHzi LQhengqbv0GA/udNn8q/9UepRsSwLgkdQ88ExaXuKQYtAqO3zjll3mIlpHn2Nc9toj3+ +2lutL9R+XET4ARQhVpOaR+exmkEuveMfYTSlRPTbX1Pnnw1nHaodx7l9SMsee5HRek4 hF9KJdf0kflRo/oAqc2seSsx5FT28GMAG/ypoTH0pxKIcleiNXCa3RC1K+QiYC/rhveI dN+kMN+9FFp0r038W1u+pCyWp5AFmcopcHSOzkl4Y7o/gOg+shqbLyaC+enVJq2SpQUH LJEg== X-Gm-Message-State: AOAM530VUKr3RfKCfFyscgqf06RI1s1Ctiy++DiTmypUR6AgZw/7RNor PjwtYYUD+pe1/vjJZyfsTz94X7/N8TPSYw== X-Google-Smtp-Source: ABdhPJyNZzO0d4qc58CqI3pL2iCjkP/wngKICwpFZQFfWFv98A2dznc6KmGD8FNalQN5iu1MHKYizg== X-Received: by 2002:a17:906:5295:: with SMTP id c21mr6304645ejm.67.1614890155644; Thu, 04 Mar 2021 12:35:55 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 2/5] tests/acceptance/boot_linux_console: remove Armbian 19.11.3 bionic test for orangepi-pc machine Date: Thu, 4 Mar 2021 21:35:37 +0100 Message-Id: <20210304203540.41614-3-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210304203540.41614-1-nieklinnenbank@gmail.com> References: <20210304203540.41614-1-nieklinnenbank@gmail.com> 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::636; envelope-from=nieklinnenbank@gmail.com; helo=mail-ej1-x636.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, FREEMAIL_FROM=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The image for Armbian 19.11.3 bionic has been removed from the armbian serv= er. Without the image as input the test arm_orangepi_bionic_19_11 cannot run. This commit removes the test completely and merges the code of the generic = function do_test_arm_orangepi_uboot_armbian back with the 20.08 test. Signed-off-by: Niek Linnenbank Reviewed-by: Willian Rampazzo --- tests/acceptance/boot_linux_console.py | 72 ++++++++------------------ 1 file changed, 23 insertions(+), 49 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index eb01286799..9fadea9958 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -802,7 +802,29 @@ def test_arm_orangepi_sd(self): # Wait for VM to shut down gracefully self.vm.wait() =20 - def do_test_arm_orangepi_uboot_armbian(self, image_path): + @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), + 'Test artifacts fetched from unreliable apt.armbian.com') + @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') + def test_arm_orangepi_bionic_20_08(self): + """ + :avocado: tags=3Darch:arm + :avocado: tags=3Dmachine:orangepi-pc + :avocado: tags=3Ddevice:sd + """ + + # This test download a 275 MiB compressed image and expand it + # to 1036 MiB, but the underlying filesystem is 1552 MiB... + # As we expand it to 2 GiB we are safe. + + image_url =3D ('https://dl.armbian.com/orangepipc/archive/' + 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.= xz') + image_hash =3D ('b4d6775f5673486329e45a0586bf06b6' + 'dbe792199fd182ac6b9c7bb6c7d3e6dd') + image_path_xz =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash, + algorithm=3D'sha256') + image_path =3D archive.extract(image_path_xz, self.workdir) + image_pow2ceil_expand(image_path) + self.vm.set_console() self.vm.add_args('-drive', 'file=3D' + image_path + ',if=3Dsd,form= at=3Draw', '-nic', 'user', @@ -828,54 +850,6 @@ def do_test_arm_orangepi_uboot_armbian(self, image_pat= h): 'to ') self.wait_for_console_pattern('Starting Load Kernel Modules...') =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') - @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') - @skipUnless(P7ZIP_AVAILABLE, '7z not installed') - def test_arm_orangepi_bionic_19_11(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:orangepi-pc - :avocado: tags=3Ddevice:sd - """ - - # This test download a 196MB compressed image and expand it to 1GB - image_url =3D ('https://dl.armbian.com/orangepipc/archive/' - 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.7z') - image_hash =3D '196a8ffb72b0123d92cea4a070894813d305c71e' - image_path_7z =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash) - image_name =3D 'Armbian_19.11.3_Orangepipc_bionic_current_5.3.9.im= g' - image_path =3D os.path.join(self.workdir, image_name) - process.run("7z e -o%s %s" % (self.workdir, image_path_7z)) - image_pow2ceil_expand(image_path) - - self.do_test_arm_orangepi_uboot_armbian(image_path) - - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') - @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') - def test_arm_orangepi_bionic_20_08(self): - """ - :avocado: tags=3Darch:arm - :avocado: tags=3Dmachine:orangepi-pc - :avocado: tags=3Ddevice:sd - """ - - # This test download a 275 MiB compressed image and expand it - # to 1036 MiB, but the underlying filesystem is 1552 MiB... - # As we expand it to 2 GiB we are safe. - - image_url =3D ('https://dl.armbian.com/orangepipc/archive/' - 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.= xz') - image_hash =3D ('b4d6775f5673486329e45a0586bf06b6' - 'dbe792199fd182ac6b9c7bb6c7d3e6dd') - image_path_xz =3D self.fetch_asset(image_url, asset_hash=3Dimage_h= ash, - algorithm=3D'sha256') - image_path =3D archive.extract(image_path_xz, self.workdir) - image_pow2ceil_expand(image_path) - - self.do_test_arm_orangepi_uboot_armbian(image_path) - @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') def test_arm_orangepi_uboot_netbsd9(self): """ --=20 2.25.1 From nobody Fri May 17 07:55:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614890526; cv=none; d=zohomail.com; s=zohoarc; b=Xut3QBZcFFwBaFb3MDbS4vvDb/JlCbIe09yXOd4mhBRVbhtgGqlqGybRbjNkzN2o5muMPDcWE5nUdHOveOVzCDLTDv2XSXWEIHTSD87rx3bcxePNjRL/S0tCx0kVTleVQkc/jWaWYWXPQEhEZfOdmVR9q/6F3dizyFtFBJjBsTQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614890526; h=Content-Transfer-Encoding:Cc: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=0Iw51pp9UDsbKR+bTJDoskOEwn0mQCRO4DvU3s7VEns=; b=PQkWYcScM7ClmIUAFtvsYVp6O5fBhCIj7oqEloyW/fPuPuudYHXr4UV6LVMKq7Y+FjCB+xh999SnR/NwBHxSvEe1K2CHusPHyg6iZlE0VL4qPwjHN9oXjRrVqGw2qryjRc0UGo2Ion78RN3ew0/ICsA1EWKYjGmaaNSuXtsikqU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614890526096166.25458215475942; Thu, 4 Mar 2021 12:42:06 -0800 (PST) Received: from localhost ([::1]:38988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHunN-0007aB-0f for importer@patchew.org; Thu, 04 Mar 2021 15:42:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHuhb-0001ix-AS; Thu, 04 Mar 2021 15:36:10 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:35565) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHuhT-0005LG-QO; Thu, 04 Mar 2021 15:36:06 -0500 Received: by mail-ej1-x62d.google.com with SMTP id dx17so24443128ejb.2; Thu, 04 Mar 2021 12:35:57 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-ebf2-7b2-6f3d-5954.fixed6.kpn.net. [2a02:a456:6be8:1:ebf2:7b2:6f3d:5954]) by smtp.gmail.com with ESMTPSA id t8sm289956edv.16.2021.03.04.12.35.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 12:35:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0Iw51pp9UDsbKR+bTJDoskOEwn0mQCRO4DvU3s7VEns=; b=pSmYC8NLS28oZcZElhZk6QUmSAFWhlIIyRXVF8TunaVmz72LcSMXGi3S1lufWR29p9 ohdvKX8HQwYgBnnSQvpICHOrF0t6kq5CkiFcVeKo6rUkpx97FPu+DQEbjnKkoedkRVzD 09Xexcomp11EX+g5PQ35HG5SoSbn+/Oo3A77nmxGGy/eeemOCa5m0gktBCiDTbMVDAwZ Oi/pX4jDZPU6HyARJaTw1Q9Bri0XqCQU3ylZ70xhKmxpVUPFTB2DpR9vYLRIHamf2JLC hbpFEyBq6HtwWMGnB4hFemIdDCKG+C85deyFsvcYjqDG2w8CnbEzyYWZhuIdtnBZ/ncq YOmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0Iw51pp9UDsbKR+bTJDoskOEwn0mQCRO4DvU3s7VEns=; b=EirVtozCHNmpAO6BoPX+ivN0UAbyYwiCAUdNGr2cWQEPfHfmwWDwnoEJO5UkHZFtaq bbg3zDpxh7iNMP3LHNFyTtVzf0OPhyFBGmO1y9VHrWu/H9CsEJZYidzlaqcDKr5qW4nY sQ4wRyQvUlCtTfoxIGo8phCY5fTiV2ES9Uj5TtsUUwIJzwBJN8pS2v3OHXcaA311tDfY 0uSowF4QHUR2I0hmiSK0nSa6/g2gvrKCPuTDYP4RizCLWeooErs6mNTmJXgV3y6p39Y4 mMuI0xyUyI5rkxMvsg028w7UwpXmnjM5HWlVrMLgMOCOLZUcKZYCIyIE42YCd78WsLiq LmWg== X-Gm-Message-State: AOAM530jETO2nz69U+6PUvnWZyC+amd6812rlvt6BJ1wiZUPRL4aTQXG sk/jWNInVPHj0qtcbC1qyAbE5oEsRyCEag== X-Google-Smtp-Source: ABdhPJwMFgRIl5lAPZnn2rObmhGg28r+l+6POMQ2NfuWXQriN8gh77+LOhRJTMlxCy8FSr1yOHG8iw== X-Received: by 2002:a17:906:2404:: with SMTP id z4mr6221233eja.14.1614890156648; Thu, 04 Mar 2021 12:35:56 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 3/5] tests/acceptance/boot_linux_console: change URL for test_arm_orangepi_bionic_20_08 Date: Thu, 4 Mar 2021 21:35:38 +0100 Message-Id: <20210304203540.41614-4-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210304203540.41614-1-nieklinnenbank@gmail.com> References: <20210304203540.41614-1-nieklinnenbank@gmail.com> 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::62d; envelope-from=nieklinnenbank@gmail.com; helo=mail-ej1-x62d.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, FREEMAIL_FROM=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Update the download URL of the Armbian 20.08 Bionic image for test_arm_orangepi_bionic_20_08 of the orangepi-pc machine. The archive.armbian.com URL contains more images and should keep stable for a longer period of time than dl.armbian.com. Signed-off-by: Niek Linnenbank Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Willian Rampazzo Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/acceptance/boot_linux_console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 9fadea9958..4a7a6830ca 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -816,7 +816,7 @@ def test_arm_orangepi_bionic_20_08(self): # to 1036 MiB, but the underlying filesystem is 1552 MiB... # As we expand it to 2 GiB we are safe. =20 - image_url =3D ('https://dl.armbian.com/orangepipc/archive/' + image_url =3D ('https://archive.armbian.com/orangepipc/archive/' 'Armbian_20.08.1_Orangepipc_bionic_current_5.8.5.img.= xz') image_hash =3D ('b4d6775f5673486329e45a0586bf06b6' 'dbe792199fd182ac6b9c7bb6c7d3e6dd') --=20 2.25.1 From nobody Fri May 17 07:55:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614890703; cv=none; d=zohomail.com; s=zohoarc; b=PhxXH+LPhOJzJHwSNTOrr0rmAD3OfK9rdNU8HWNjXexkSpKX6MgVt6MtM2qcy7W3nzQCRxvgXuZZMHhP3uxP+EqyZAQGrH1106k3pbR6a1zn6CTUkwfV8NjSGr/Ywg4EfK5TfphkF2yggsqiMBqNxYIke9UGz8GGAnWe32HvZTU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614890703; h=Content-Transfer-Encoding:Cc: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=DfX0PX9k5vslF+u0G7Geev69QRDpZEy4IHT6ko0vTfg=; b=k9cI/RgRMJxIPMxaKrlySwX1AZWXcLd0Rbf9RWLsW3HMnowvvBAXiNnO2nQKqaVyFgC7Ovb1r4mEB8s260xaLikN0EQPrjX9rNYQDSZZ4bEHkTzE2KpWdNKOG1/GUc/pBoQe4YIZiFDAyLRNFuDalofoPb0ACa3zi+5ti08pOBY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16148907036441016.5477049676924; Thu, 4 Mar 2021 12:45:03 -0800 (PST) Received: from localhost ([::1]:47410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHuqE-0002lo-EQ for importer@patchew.org; Thu, 04 Mar 2021 15:45:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHuhg-0001jo-5V; Thu, 04 Mar 2021 15:36:12 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:32903) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHuhT-0005LT-Sy; Thu, 04 Mar 2021 15:36:11 -0500 Received: by mail-ej1-x631.google.com with SMTP id jt13so52119122ejb.0; Thu, 04 Mar 2021 12:35:58 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-ebf2-7b2-6f3d-5954.fixed6.kpn.net. [2a02:a456:6be8:1:ebf2:7b2:6f3d:5954]) by smtp.gmail.com with ESMTPSA id t8sm289956edv.16.2021.03.04.12.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 12:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=DfX0PX9k5vslF+u0G7Geev69QRDpZEy4IHT6ko0vTfg=; b=jjN/oXlPnXf71M43yhNt3SRLOMSNXDRKj/kttg1Zn7NvQTh6pynZRP712ILNugGdaM NhrutsxXA8MDSJ/E1N9DXS2TCCgnA1RBx6J2al6im5YG1pf2Ow90O69cKHZyo2KDsnBI 9FNffMkn0LVvisO03tcs7UpK4bASeRvlVQb4POIgmI1/I09jC38wFfxjcO8qzVEVKpml xHPmnBo2EuqQ7qgoAoL7UzT0tGh/H2koLdPaqFkq6fzFqISOlw/fsyYA8oM4sQ/U/S5k nrHLsT9Ux3MrYeMRo2MQjEfZL5XgaQKv+QTe+dqWPaPNRtcbfJ2ZSmYsTP9ZjjbGm7ut fYWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=DfX0PX9k5vslF+u0G7Geev69QRDpZEy4IHT6ko0vTfg=; b=Zlf8UsG4qUpL2Q5FQCyoNvL5cL+WXA3wgbmyLXhgiPhRjA+F5Bc62owuGtkwwBLxQy QBvmklKCcKrD0bZYVcNghL5cFgEXwLbC4rFsae7ZOOLxYDd+3RwzHdX/9oIDYVbIGden WmsT6PjJitgWJTM6haKUIXKrkOGCRGt0ShHAQnLzWDi+qBzUAhPhs7nOwvJWR6++YTm0 dH7odrnmxoK5WHJVE/nUyjaReVPJQ6jDjjYwrw5KioTiQ1zepWpplb+05nWmLtoPjf4j xTDDJbxdBGhultGqooweHvuApbj6bJmuVqNQBaTbcGMkQeYSAT/YP/1FQeueF6UKSC9o VGCw== X-Gm-Message-State: AOAM531YJBMTSHJx0DFBiDPfJG8r5jEAPaWeFp/zgNY25fpiW/qFlDPo bo0hp/k8nriQTGdQahwY6am4NsCl2Od9EQ== X-Google-Smtp-Source: ABdhPJxMiEAWvd8NXDHoFD924xyL1UVmw7X5xezZYi2hGzXpm/ZfZdGzsN/zoydfOP6aD2iunlTdwQ== X-Received: by 2002:a17:906:6047:: with SMTP id p7mr6322074ejj.400.1614890157344; Thu, 04 Mar 2021 12:35:57 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 4/5] tests/acceptance: update sunxi kernel from armbian to 5.10.16 Date: Thu, 4 Mar 2021 21:35:39 +0100 Message-Id: <20210304203540.41614-5-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210304203540.41614-1-nieklinnenbank@gmail.com> References: <20210304203540.41614-1-nieklinnenbank@gmail.com> 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::631; envelope-from=nieklinnenbank@gmail.com; helo=mail-ej1-x631.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, FREEMAIL_FROM=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The linux kernel 4.20.7 binary for sunxi has been removed from apt.armbian.= com: $ ARMBIAN_ARTIFACTS_CACHED=3Dyes AVOCADO_ALLOW_LARGE_STORAGE=3Dyes avocad= o --show=3Dapp,console run -t machine:orangepi-pc tests/acceptance/boot_lin= ux_console.py Fetching asset from tests/acceptance/boot_linux_console.py:BootLinuxConso= le.test_arm_orangepi ... (1/6) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_or= angepi: CANCEL: Missing asset https://apt.armbian.com/pool/main/l/linux-4.20.7-= sunxi/linux-image-dev-sunxi_5.75_armhf.deb (0.55 s) This commit updates the sunxi kernel to 5.10.16 for the acceptance tests of the orangepi-pc and cubieboard machines. Signed-off-by: Niek Linnenbank Reviewed-by: Willian Rampazzo --- tests/acceptance/boot_linux_console.py | 40 +++++++++++++------------- tests/acceptance/replay_kernel.py | 8 +++--- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 4a7a6830ca..04a8b23352 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -515,12 +515,12 @@ def test_arm_cubieboard_initrd(self): :avocado: tags=3Dmachine:cubieboard """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubiebo= ard.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/' @@ -557,12 +557,12 @@ def test_arm_cubieboard_sata(self): :avocado: tags=3Dmachine:cubieboard """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubiebo= ard.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/' @@ -686,12 +686,12 @@ def test_arm_orangepi(self): :avocado: tags=3Dmachine:orangepi-pc """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + 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) =20 self.vm.set_console() @@ -713,12 +713,12 @@ def test_arm_orangepi_initrd(self): :avocado: tags=3Dmachine:orangepi-pc """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + 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) initrd_url =3D ('https://github.com/groeck/linux-build-test/raw/' '2eb0a73b5d5a28df3170c546ddaaa9757e1e0848/rootfs/' @@ -758,12 +758,12 @@ def test_arm_orangepi_sd(self): :avocado: tags=3Ddevice:sd """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun8i-h3-orangepi-pc.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + 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') diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_ke= rnel.py index c1cb862468..8c68caae31 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -185,12 +185,12 @@ def test_arm_cubieboard_initrd(self): :avocado: tags=3Dmachine:cubieboard """ deb_url =3D ('https://apt.armbian.com/pool/main/l/' - 'linux-4.20.7-sunxi/linux-image-dev-sunxi_5.75_armhf.de= b') - deb_hash =3D '1334c29c44d984ffa05ed10de8c3361f33d78315' + 'linux-5.10.16-sunxi/linux-image-current-sunxi_21.02.2_= armhf.deb') + deb_hash =3D '9fa84beda245cabf0b4fa84cf6eaa7738ead1da0' deb_path =3D self.fetch_asset(deb_url, asset_hash=3Ddeb_hash) kernel_path =3D self.extract_from_deb(deb_path, - '/boot/vmlinuz-4.20.7-sunxi') - dtb_path =3D '/usr/lib/linux-image-dev-sunxi/sun4i-a10-cubieboard.= dtb' + '/boot/vmlinuz-5.10.16-sunxi') + dtb_path =3D '/usr/lib/linux-image-current-sunxi/sun4i-a10-cubiebo= ard.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.25.1 From nobody Fri May 17 07:55:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1614890870; cv=none; d=zohomail.com; s=zohoarc; b=CUXtAGmxSqod1DU4YrrIVwZr4oSOSYjdhgnfEJEal+raym0qKhSLg+A0lmFa8IKIsgqzQW0YfUh9eRRejkNQ4MVngZePc5NKWZ78p7GKSR2F/9PCVCWWsHjisEk3z7PakjEoJYjoOLBIDpgm8h1hHS8CA402ormPypY3VEw2GRE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1614890870; h=Content-Transfer-Encoding:Cc: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=b9qEBEsjw3h6ZixY/rrA1wqPt0igetkySkLM2hkCrhc=; b=S5ma4FSIy5VeVrSXpVPFir+DeXSKRrPA/2XuQXeQ0jNUZRwNLMmyXpHwvTny5CKL/PMT2EsoDwDNVjEB+wCBTfEldl7DTxAw8DMLHmb7vNwWcNWIwYhOShl0fddIUcKV8zxND5rwBDF3GuojhCBU3CtmrAn/DmCO2Y2bGC5dKis= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1614890870203422.6594556219967; Thu, 4 Mar 2021 12:47:50 -0800 (PST) Received: from localhost ([::1]:52816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHusv-00058j-2U for importer@patchew.org; Thu, 04 Mar 2021 15:47:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHuhb-0001it-9F; Thu, 04 Mar 2021 15:36:10 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:36287) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lHuhT-0005La-SZ; Thu, 04 Mar 2021 15:36:05 -0500 Received: by mail-ej1-x62d.google.com with SMTP id e19so1134208ejt.3; Thu, 04 Mar 2021 12:35:58 -0800 (PST) Received: from tuf.home (2a02-a456-6be8-1-ebf2-7b2-6f3d-5954.fixed6.kpn.net. [2a02:a456:6be8:1:ebf2:7b2:6f3d:5954]) by smtp.gmail.com with ESMTPSA id t8sm289956edv.16.2021.03.04.12.35.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Mar 2021 12:35:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b9qEBEsjw3h6ZixY/rrA1wqPt0igetkySkLM2hkCrhc=; b=KzOy/wLmUbpwTWJCt5NV+/CPksMnKOtmB83uxQhZs1jhCAo0WR0XpCTRcIMY1xNsnj OIHe8ztYmUiJAVfIWsk8JRTJAc5tGoQ9yggm7nzVvi1kakJ/GQK7zRMd1BbRIBYpDqxm qYpdAbFBwbhn4slPGfS8QXPuWpttPidCG6oilpqL39t9rlw9C1hIzMt13iutQemLxKVE +jEKNAGDkXCetx/6J8XdiuEF9b8Rj5tC3DkyYfFTmdLUT/iad7RBVaTEg28sIloPO8mq 4q/OYtpneqRFNZt67+2bMPHhAF2MH5/Nuw0YW1eR+UBdy5jCsbJJ1xMPGl/jwAfuKEPQ JhyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b9qEBEsjw3h6ZixY/rrA1wqPt0igetkySkLM2hkCrhc=; b=RuXKiBhDl50g+xiZ4sOtwZODYflsLBR13vyoIUAIIxS9o1O++q7qgd3vjuto3Gf+IV +kuIyiqRy0TXWtNvRvsikt70nI9uRagemtvUH+HmS1PE5rSRct6lrE8sJcnQAIz1+HA7 jjRWzapQEeeHwijdKQnZvJZfD05EolwOwik95OKGwmvAcF6iCgY5N07JdZ14e1dpynGM lvcyLbbFZIhtYkPWDE69PjLltxmpv8x1Z4pHfVbNTp3AT2a+eSXJFRqBX6jTc50Q8Jlf qXjgTO2V6D8msfwPc6I8S6CN6j+n7JKq9eGvdj9woeODMdcMDnX3ITyy8ZVosVdeqceG OZlg== X-Gm-Message-State: AOAM532BdFcZgCRMSZsuovYBeqYueQnFtSF3dmHhNoJcYvv1oi8NfaeX DdUiQpoA6Y0O5MV3d32kpcrHyePnfzqF/Q== X-Google-Smtp-Source: ABdhPJwjcWVIqYw83o+0iNRyybXEiO7f8NzZhiqdGHbuuPTJ1QNW6vE6Tmkzbf8ff7q/j6qKvpf+rQ== X-Received: by 2002:a17:906:4f02:: with SMTP id t2mr6219169eju.121.1614890158113; Thu, 04 Mar 2021 12:35:58 -0800 (PST) From: Niek Linnenbank To: qemu-devel@nongnu.org Subject: [PATCH v3 5/5] tests/acceptance: drop ARMBIAN_ARTIFACTS_CACHED condition for orangepi-pc, cubieboard tests Date: Thu, 4 Mar 2021 21:35:40 +0100 Message-Id: <20210304203540.41614-6-nieklinnenbank@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210304203540.41614-1-nieklinnenbank@gmail.com> References: <20210304203540.41614-1-nieklinnenbank@gmail.com> 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::62d; envelope-from=nieklinnenbank@gmail.com; helo=mail-ej1-x62d.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, FREEMAIL_FROM=0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, thuth@redhat.com, berrange@redhat.com, f4bug@amsat.org, b.galvani@gmail.com, Niek Linnenbank , qemu-arm@nongnu.org, Pavel.Dovgaluk@ispras.ru, crosa@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Previously the ARMBIAN_ARTIFACTS_CACHED pre-condition was added to allow ru= nning tests that have already existing armbian.com artifacts stored in the local = avocado cache, but do not have working URLs to download a fresh copy. At this time of writing the URLs for artifacts on the armbian.com server ar= e updated and working. Any future broken URLs will result in a skipped acceptance test, for exampl= e: (1/5) tests/acceptance/boot_linux_console.py:BootLinuxConsole.test_arm_ora= ngepi: CANCEL: Missing asset https://apt.armbian.com/pool/main/l/linux-4.20.7-su= nxi/linux-image-dev-sunxi_5.75_armhf.deb (0.53 s) This commits removes the ARMBIAN_ARTIFACTS_CACHED pre-condition such that the acceptance tests for the orangepi-pc and cubieboard machines can run. Signed-off-by: Niek Linnenbank Reviewed-by: Willian Rampazzo --- tests/acceptance/boot_linux_console.py | 12 ------------ tests/acceptance/replay_kernel.py | 2 -- 2 files changed, 14 deletions(-) diff --git a/tests/acceptance/boot_linux_console.py b/tests/acceptance/boot= _linux_console.py index 04a8b23352..1ca32ecf25 100644 --- a/tests/acceptance/boot_linux_console.py +++ b/tests/acceptance/boot_linux_console.py @@ -507,8 +507,6 @@ def test_arm_exynos4210_initrd(self): self.wait_for_console_pattern('Boot successful.') # TODO user command, for now the uart is stuck =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_cubieboard_initrd(self): """ :avocado: tags=3Darch:arm @@ -549,8 +547,6 @@ def test_arm_cubieboard_initrd(self): 'system-control@1c00000') # cubieboard's reboot is not functioning; omit reboot test. =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_cubieboard_sata(self): """ :avocado: tags=3Darch:arm @@ -678,8 +674,6 @@ def test_arm_quanta_gsj_initrd(self): self.wait_for_console_pattern( 'Give root password for system maintenance') =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_orangepi(self): """ :avocado: tags=3Darch:arm @@ -705,8 +699,6 @@ def test_arm_orangepi(self): console_pattern =3D 'Kernel command line: %s' % kernel_command_line self.wait_for_console_pattern(console_pattern) =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_orangepi_initrd(self): """ :avocado: tags=3Darch:arm @@ -749,8 +741,6 @@ def test_arm_orangepi_initrd(self): # Wait for VM to shut down gracefully self.vm.wait() =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_orangepi_sd(self): """ :avocado: tags=3Darch:arm @@ -802,8 +792,6 @@ def test_arm_orangepi_sd(self): # Wait for VM to shut down gracefully self.vm.wait() =20 - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') @skipUnless(os.getenv('AVOCADO_ALLOW_LARGE_STORAGE'), 'storage limited= ') def test_arm_orangepi_bionic_20_08(self): """ diff --git a/tests/acceptance/replay_kernel.py b/tests/acceptance/replay_ke= rnel.py index 8c68caae31..71facdaa75 100644 --- a/tests/acceptance/replay_kernel.py +++ b/tests/acceptance/replay_kernel.py @@ -177,8 +177,6 @@ def test_arm_virt(self): self.run_rr(kernel_path, kernel_command_line, console_pattern, shi= ft=3D1) =20 @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') - @skipUnless(os.getenv('ARMBIAN_ARTIFACTS_CACHED'), - 'Test artifacts fetched from unreliable apt.armbian.com') def test_arm_cubieboard_initrd(self): """ :avocado: tags=3Darch:arm --=20 2.25.1