From patchwork Tue Sep 20 17:15:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607631 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2029320pvb; Tue, 20 Sep 2022 14:13:05 -0700 (PDT) X-Google-Smtp-Source: AMsMyM559gqOCjQYqngyKdkj/UJygskbPJNdjIbf0XGEClHluD3lyladL0TgrDWAvY3Lgit1BA0m X-Received: by 2002:a37:b247:0:b0:6ba:ed13:dd89 with SMTP id b68-20020a37b247000000b006baed13dd89mr18043337qkf.771.1663708385505; Tue, 20 Sep 2022 14:13:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663708385; cv=none; d=google.com; s=arc-20160816; b=L2NGnGl85wyRNA9OjuE4MW8PvtxC4SQGvV6VGUVU2BbuwV7leutconrUnui8RpWzg+ IbJQn+nptckNYrMAzcdK4acq35K5zB6bDOcNd5Z1I2Sq8NzXsLHevXaSGkVZaRfjcR1C pJ04Ac9eoG84Z8vHr3GYsIAzCkCrkfPwv4yA2mZJgKueUwwJFgkkMMls82uWrqvIJfS/ W2TyiSRSuKKyZ5eR23YWvyBDkDWaW7EJK7OKV41oskQE8H9dCPYBVo0j3zcdQhwXmU62 bRI1wSnP44/9xGq9fC8cyP0XAKmFOm/uMcNHGZRxi6seZdYtj1NzxwnHeEjdaDHeTtA+ 4gmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Xn9EeJ1e0W9n/ww6L6+IOrL4d7Yg4BtDuGfce46InmQ=; b=fLHrjxyhUvABPre+/IjMNOSMzCNqBYSx1NA5EwneylEAfbv0B1xTcDgbbjhZjpkmdq 5/+ms81VJPsAHMFPrInPXTwAtsxxueDlO6BmP0+qeQADquJZhgHn0xzwerAlxUGJaocs YdBIBNsKSIG5RZ46nHOC4uIE3Ln/9GpxoXoYc/5Y8zIBtjJlRvGRimCGzGB7jr44Pf+X XXQ7XsOvT0wqtYN/aWjLRQt+3atZiLt+hljTgIsmY3wR5kdNuAwV3TClDo4rqClbsx3p 1Vd/dcWgLlap6y2TrgwqLLtUGlaE/fE/zTq5ziQBe/aaiG5GvQZWvFU/LDTgM2DGzx0X fZiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Muoshtcm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w12-20020a05620a444c00b006b8f3cfec88si621760qkp.446.2022.09.20.14.13.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:13:05 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Muoshtcm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakYD-0004AV-0e for patch@linaro.org; Tue, 20 Sep 2022 17:13:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqT-0000KD-01 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:41 -0400 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:36645) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqR-0000eJ-9k for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:40 -0400 Received: by mail-ej1-x62a.google.com with SMTP id 13so7827874ejn.3 for ; Tue, 20 Sep 2022 10:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Xn9EeJ1e0W9n/ww6L6+IOrL4d7Yg4BtDuGfce46InmQ=; b=MuoshtcmoQci0CvXVYKhCnLNK/M3BqwOyaRpMkviKxjG0X5hWeBBjQFDwVCksMh+XV TH6CrdigTMQnp1DqnSVmPP8jg4Su5MsKEAFP2FK3514hMn475AhOVwVb3x1xfnn5HCL2 GXZ1OlDC44PPrAyOFDBM9qADPwkFZI2OerRBR+T+18vsA/UUxvqZG0cus+E05gnR7AIZ /oJJLaFYispqt6FrsbSeOigmPhNxnL5VFK0nXKC3Y74CPeeWA3HDAm6hSSw1Zux74iaM i1T8AbTfpjmFga1QRGz2oWVGRESHetSj2zfsjyqnRMabdl0nZB3NVeV04/F8BbNLfIm1 LcWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Xn9EeJ1e0W9n/ww6L6+IOrL4d7Yg4BtDuGfce46InmQ=; b=No5F8dOrpS8od+I2yp6YtM81QB16fqufCgTEpbZGBS48son4oRr/zOd+pcMVMYZCnB P6SY6b4fB745olfT1uZAeJA6QyqRCl6w+KE67U7QPDMYRvklC0DwElLnafg2j9M6o/kk SmiKQvZTKZOvjCQjkGRgoGv5g1SNIZ5+vxMS/gaKcpIzwsPp6IS/Al8Tq/E0QRNSFINq YybalJZb4dJ+uoANT6jinbzjEOn0ilyvRKU85bqTJh1HP4GJSBvwEKOQuBJUJpMPt3iC 0XGad+NQ2e2PetWnrDaPy+QRGKot2Hd9/NcWKyyNBaBQis4iRS6sEQyPIF7PyDPvP9V9 LHOA== X-Gm-Message-State: ACrzQf0InMz/37PDnuB4ERnolt9Sl7sS2JTNhihzlWn5/lqk1xgI9HWV hgGEvP7B/p1QaARlaMWdI57kEA== X-Received: by 2002:a17:907:2d2a:b0:77e:def7:65e9 with SMTP id gs42-20020a1709072d2a00b0077edef765e9mr17615721ejc.85.1663694137714; Tue, 20 Sep 2022 10:15:37 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g17-20020a1709062db100b0077f15e98256sm103221eji.203.2022.09.20.10.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CCC6B1FFB8; Tue, 20 Sep 2022 18:15:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 01/30] gitlab: reduce targets in cross_user_build_job Date: Tue, 20 Sep 2022 18:15:04 +0100 Message-Id: <20220920171533.1098094-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62a.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We already limit the scope of the cross system build to reduce the cross build times. With the recent addition of more targets we are also running into timeout issues for some of the cross user builds. I've selected a few of those linux-user targets which are less likely to be in common use as distros don't have pre-built rootfs for them. I've also added the same CROSS_SKIP_TARGETS variable as is occasionally used to further limit cross system builds. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-2-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index 28b2142ec2..5e8892fd49 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -46,5 +46,8 @@ - cd build - PKG_CONFIG_PATH=$PKG_CONFIG_PATH ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-system + --disable-system --target-list-exclude="aarch64_be-linux-user + alpha-linux-user cris-linux-user m68k-linux-user microblazeel-linux-user + nios2-linux-user or1k-linux-user ppc-linux-user sparc-linux-user + xtensa-linux-user $CROSS_SKIP_TARGETS" - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS From patchwork Tue Sep 20 17:15:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607630 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2027732pvb; Tue, 20 Sep 2022 14:09:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4EiMpMcpzgrmbqC0lyZZRnrjS9rEOsUARYE0uzdesEVKN81dC2XSm1cxAmzknDFabd17jN X-Received: by 2002:a05:6214:1d21:b0:4ad:1361:befa with SMTP id f1-20020a0562141d2100b004ad1361befamr18460913qvd.111.1663708167534; Tue, 20 Sep 2022 14:09:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663708167; cv=none; d=google.com; s=arc-20160816; b=fo5lGuKvMa5OwLEOwt0FXmlOkYRZzKfmIW07XDV0jz1EnVjmC6oHGCOjE3Qn3Ff9/u trt/5D+ef1Z9NZdb/SD6rH5HqTL4Jq3rqhFg0V3GwEcS/rtc18bU0Dl2V/LBxbXUUcFn vZB4I489XtWSpj1rxoOLatRhu5FVUtu+bmkCuVZ8CYK9KfTnZTgE0x8gTrNVN7TbL/dk hA9kLqju8m4o9G8TzRcCC8VKo1foI/BfbkuaZiAvS7mNSXB0r7uJDI90jBaGvSdEXGA5 uDGeWE6QSyMeYF6jd9HxTiKSpKSaEL2Za6iKKDQXMlU1aGSj15HUFhapbfDQCF9sx9RL qTiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=9jZtMLEWUNRGMJhs1MyLKK4Uh8abbgf3TTaN/xU7wp4=; b=DwJ1kDLSeYfGr+ibRE1P6Ow9YCsrGllfWpodVMWrtVGEvjbXZIl/YJjmkCCGfJUEap nj9hoyNBnTqvkk+lvVEgNDrCRacKTPmriueRuN1/7uk73/IMpuD5rmzzBUjpUyExmaFV Nr/98Q6dplap0yzKG5YPrWYM0jXMe71eGISYWL5JFWJgrvoyNtJS9RxnkJaB75eVFjQ4 WgDm8ZDyHMtubsqWf2pEoVp17FNkM7ZTD8UI9DvzPbxvXM4ocbUUks1JCQHkO0ExGdyP kaW6/8qdvA5UD2sWVqcGX8gnHD2lLqMBSMq1y3XOhnoB6ASxB53labiNvrj1Ot5xuYgs laMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EbumFRFl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z9-20020ac81009000000b0035ba8fd792fsi398350qti.245.2022.09.20.14.09.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:09:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EbumFRFl; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakUg-0006FV-M5 for patch@linaro.org; Tue, 20 Sep 2022 17:09:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqR-0000Ia-Pr for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:40 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:34705) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqP-0000eC-Jy for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:39 -0400 Received: by mail-ed1-x52a.google.com with SMTP id z2so4870683edi.1 for ; Tue, 20 Sep 2022 10:15:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=9jZtMLEWUNRGMJhs1MyLKK4Uh8abbgf3TTaN/xU7wp4=; b=EbumFRFlq2BIzT5tsHEKR3/ja7X2fkc3yMZ9XcpqGmbVKq4tdVbDTfJ16EyxbajZi7 +lpojXO/CTVQqHjVhN6T0iQJWfyow6xPrX/PArS9hYbWi0rLtEcNUHVk0piyF8QfGmm6 ZHJ4Qt6SIJ0Uw9JOLRietHN/rhGzsAc3hddGgXQz3vyfn90V7Pqh6Hgm/1hd2apLP+sb HVTUAyRMN1TqSP7X0BZYbMhXbieBumMuu8Iplxh4biVb59DV+99iKiRwLy/MNcDZ6LUw TOGr9+dd09EjRIpWcBK7jgaT4BAUfozGVns6zOrbXAzcmtYCKnFaRw+/c35gcmrb2zHE NsZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=9jZtMLEWUNRGMJhs1MyLKK4Uh8abbgf3TTaN/xU7wp4=; b=qS7kv+vxAo3GWPTX1uNiag40fPkcehavEqkkRym7gSfzXMc+vlgZeS8cyj7t4+Eksy fjIGdddfyfratWM3Pxfqpx6YOL2KcXxiRcV0UOW11MY2IahLtF5vOq4VScQMiZGXqafx Bqlg0jvyGVe9ir5XYtE/wlP35j65DTyBQhnRccODQ/j/+xRLxveQhzIqy5kE8wPdN3O2 or1edeFy+MYo469BCoXAB0hWfMpzXK1ZSt2SCmTh2xLtUWNKAKQYNYTTRA1EaON1Ouwj iQEWa3GYOmq1WhjDN5Pjvlpq7Bf2/N8ghJr7FC00bhotGvJPO4JyFc44HWgtCc47Sb9V mnHw== X-Gm-Message-State: ACrzQf2yd8VRKmfU/1UzzR9qEZPIrt5tbmMTV15/rFk5kjdkxIlFqmcd hsoAOf5VkzhopTs7NHlE1nL6VA== X-Received: by 2002:a05:6402:3890:b0:451:ef52:8f9e with SMTP id fd16-20020a056402389000b00451ef528f9emr21407038edb.107.1663694135551; Tue, 20 Sep 2022 10:15:35 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g5-20020a170906538500b0073bdf71995dsm140217ejo.139.2022.09.20.10.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E47AE1FFBA; Tue, 20 Sep 2022 18:15:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Thomas Huth , Alistair Francis , =?utf-8?q?Alex_Benn=C3=A9e?= , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 02/30] tests/avocado/boot_linux_console: Fix the test_aarch64_xlnx_versal_virt test Date: Tue, 20 Sep 2022 18:15:05 +0100 Message-Id: <20220920171533.1098094-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52a.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The assets that this test tries to download have been removed from the server. Update to a newer version to get it working again. Signed-off-by: Thomas Huth Reviewed-by: Alistair Francis Message-Id: <20220829080940.110831-1-thuth@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20220914155950.804707-3-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux_console.py b/tests/avocado/boot_linux_console.py index 6b1533c17c..f26e036ab5 100644 --- a/tests/avocado/boot_linux_console.py +++ b/tests/avocado/boot_linux_console.py @@ -335,13 +335,13 @@ def test_aarch64_xlnx_versal_virt(self): """ images_url = ('http://ports.ubuntu.com/ubuntu-ports/dists/' 'bionic-updates/main/installer-arm64/' - '20101020ubuntu543.15/images/') + '20101020ubuntu543.19/images/') kernel_url = images_url + 'netboot/ubuntu-installer/arm64/linux' - kernel_hash = '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50' + kernel_hash = 'e167757620640eb26de0972f578741924abb3a82' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) initrd_url = images_url + 'netboot/ubuntu-installer/arm64/initrd.gz' - initrd_hash = 'd385d3e88d53e2004c5d43cbe668b458a094f772' + initrd_hash = 'cab5cb3fcefca8408aa5aae57f24574bfce8bdb9' initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) self.vm.set_console() From patchwork Tue Sep 20 17:15:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607643 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2043798pvb; Tue, 20 Sep 2022 14:52:06 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6FLfwxgMZ4M/vkeJPi248T6xhDVfHf0GmXKFkBVbb9vw5NBFu0q/UbiwQ7LBg7Lio/KUF+ X-Received: by 2002:ac8:5c09:0:b0:35c:e2f0:c3da with SMTP id i9-20020ac85c09000000b0035ce2f0c3damr11974309qti.107.1663710726009; Tue, 20 Sep 2022 14:52:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710726; cv=none; d=google.com; s=arc-20160816; b=IoiTLlaQGtMEWzH1c2dB/jJUePQDEiDjvx985YQ31jCFHDBUjM7XKT4Zi3kKTEs9xP 76lK77Pkzmcjv/+fBoh8dgA2RGaDDfygpsOc8VdZuWs629+RWJdmsWX84ZdXtdW9LM/X c02JK+S8hXNfsNHOS6RJNp7Gp3/ugVijLkNt7TnsRubSR4098ersw7WymFzUiMJuKvUS tT98O5eKa8xaNtxIbekcc5s4q2HmYFLh8sKPOB0kbc/7RG1sobPIq30sVURKhyzdBW2W Ow3IQnWa3yz/AL7GsPhmg9ii7sU8bcnhXCpC058uj/iuAGn3npK6ZVBGPAAx6W9xdO5C weUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=N17HHU9yrrmBbTr01LSTUzVVxN6Q3/Gwl12Sohrp4oE=; b=eTXO0FHdRG15JTMoxtqA45Sv848aBpA3ev+I7x5dM6Nk7514zSbNB/VSantTV5DDKf ixXwA++cZ2BahF7qJ4UruOGTwM+4Odq0VjIC/B843Ag8WyVoWVYOkM/NvgA0qOca2a5M 2k4DBK8bG4Yk7TXPCQHO/lT+k+C0aRasv7j3ZaDYUHn4d84t2gAFknKg3eCiF4XWbNHp SuzoCkh85Sj/ZEPquVSArHOinMAOlyr4oElADKsbvTiA4vbcddKFp1QZdwtpk5EFh6U6 YwV5UXpYuXBGTmR7+PsqXZKCWXtcMJ8tMpiRqQQmPanZBD1FBhza4l/NT4eNeD63MVEK rN2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HHTZKyCf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ay30-20020a05620a179e00b006cee6ae7961si765892qkb.148.2022.09.20.14.52.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:52:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HHTZKyCf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal9x-0000JX-HK for patch@linaro.org; Tue, 20 Sep 2022 17:52:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqW-0000Qa-0h for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:47 -0400 Received: from mail-ed1-x534.google.com ([2a00:1450:4864:20::534]:46818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqU-0000eh-Fj for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:43 -0400 Received: by mail-ed1-x534.google.com with SMTP id z13so4775344edb.13 for ; Tue, 20 Sep 2022 10:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=N17HHU9yrrmBbTr01LSTUzVVxN6Q3/Gwl12Sohrp4oE=; b=HHTZKyCfrbe30kYFCkCBEbMOz3f0DQmQ369vTAB5u079yyPT9FHr/7umo6x9/qPRuu +yXxoQzJRo1lOKNebZS4SMjffSREamblDi9+hZMI7bVVhHQkg4b3VurgNkfCJNJXdJzq iRswGJe4TbCkma+Tdlpk8X4ZwrXa07GC9NeLDpyc0CoeHMImgGEKxAdPj07XM0+EPgAR 11roU7L13VRzKvH3QCihTbnHjuJsAfnO9tOThfTnnoaMO9GQBywaTtoRtWuom69bpTU9 V0NzEEnC3gM2lsEs3T72EZeIom83vTJZg2+RfyE0YOSoeMwQ4OeAnkJZkiR9ILnS+5NS 2Z1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=N17HHU9yrrmBbTr01LSTUzVVxN6Q3/Gwl12Sohrp4oE=; b=n++b4eANgDV5HtZiTx6Ivrn2WqJh6av/76LdgFnt7vZPrv3AYrjlaXVes3aAi0kg86 k/2jEzr/0iYSuxaJPFoOBay1lR1WbYI8ipMf2YCpS6jO9bwqizfYOZj+Nu97u8FfA5SS qelzKxneiSBukFs16mV7DbrPBTg6ANX6yZFo1lMfwpgUWCCZMRb/E6189MWVjbXTrtfb 8iLEhflNSCgqESjExh1Uii21Mm0ffQzdoWhNpwVzpeAXRKq1zTiXVX+rZGZDLwpLAhhy 9o6GYVg1UL7ombxZd/IpWjjxEs5k64/D1o0/oTUR/Xzc8F+rohUn2vfSZGTusUpwjGGK 9jmA== X-Gm-Message-State: ACrzQf27/J+raxX49H83EvCfSSOtOdkGRvS/ttg5KuNJMgY2MpNkAm8x v3xbH5qNLcZPuYZwQ0tTPE70pw== X-Received: by 2002:a50:fe8c:0:b0:454:31ad:b99a with SMTP id d12-20020a50fe8c000000b0045431adb99amr8199566edt.165.1663694140970; Tue, 20 Sep 2022 10:15:40 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id kx21-20020a170907775500b0073d5948855asm193228ejc.1.2022.09.20.10.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:34 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 06B211FFBB; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 03/30] tests/avocado: add explicit timeout for Aarch64 TCG tests Date: Tue, 20 Sep 2022 18:15:06 +0100 Message-Id: <20220920171533.1098094-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::534; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x534.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We don't want to rely on the soon to be reduced default time. These tests are still slow for something we want to run in CI though. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-4-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index ee584d2fdf..67a24fe51c 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -63,6 +63,7 @@ class BootLinuxAarch64(LinuxTest): :avocado: tags=machine:virt :avocado: tags=machine:gic-version=2 """ + timeout = 240 def add_common_args(self): self.vm.add_args('-bios', From patchwork Tue Sep 20 17:15:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607645 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2044923pvb; Tue, 20 Sep 2022 14:55:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6VMSPybqy7AcaYwVDLtHuHCyAMjIQOF0DAepEKXNnozHbn3POcZ7KQPCSaiIU29ecV+RcH X-Received: by 2002:a05:620a:bd4:b0:6cf:468e:e092 with SMTP id s20-20020a05620a0bd400b006cf468ee092mr2304994qki.583.1663710930553; Tue, 20 Sep 2022 14:55:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710930; cv=none; d=google.com; s=arc-20160816; b=o4JKW9m5LMeOHBfLFGMgagWJkb2wf048xxGscYDZsysy8+0VqSWavuqfOU8X5od7vr g/TjMPXojS1qZCPAusmQHM0oEcS8krP6Re+aB6zLp8Tz2jXGGCpgxkteEcbKeFxlL3Kg FgdDQSxrRkM66mMfw8nklmB8xCvexQZX8WNvm06iL9ahzQhW7PV8XQv3oJfhyuM1wz6E 51ySf2Ts95YoXgHpej7fwQDEh7TWCYK+lk5kHjb1l/SjzJxIu+RzrKVoyiYB48DD6Vyn gj67Ij/Ym+ykWfll1EGLBsr5CTLJjiT/8MxhO+Y459EteSsyptuZ/Dezyag1b+ucGixO IQ5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wjsUAAComu1E7rFx1ESKMnJu2Ixm3maECOUpSPdRd/Q=; b=eTKXYzsXnK4f9/+2qjLfsAWwj1ZVq9Vs3gZdSjxaoc0t527pXHBIzKjrVpkvL1ZWKD T0aswHnXeqxZrgij5GaaK54oj3GKQn0+rs2jQe5fdq9CIUGh8o/eX0HgS32mh3oRVNv7 qW76LuJqBGXVCzOGEoxOYkkplgAK/7uD59E/e+BZ//7AAOpkbCyQKnUirmoY8pFdiBhm gNSpgYizV9bUWUQ/hnjDVUBxvWK3iqbhtAIrceBLQKj1Yyr5LmSneMeoyxfvGJYy+gyO lUuYjZUuOuCNNPeYcX3c7YD/SZwbrS6UA1sZZ1GkIv9AfCrYFKWbG3B/iPpdZSwTokON Jz4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mq28BbXi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id dm39-20020a05620a1d6700b006be8b30c225si712800qkb.102.2022.09.20.14.55.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:55:30 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mq28BbXi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33038 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalDG-000683-2e for patch@linaro.org; Tue, 20 Sep 2022 17:55:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51404) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqZ-0000VB-UF for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:47 -0400 Received: from mail-ed1-x532.google.com ([2a00:1450:4864:20::532]:45609) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqW-0000f9-82 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:45 -0400 Received: by mail-ed1-x532.google.com with SMTP id m3so4797497eda.12 for ; Tue, 20 Sep 2022 10:15:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=wjsUAAComu1E7rFx1ESKMnJu2Ixm3maECOUpSPdRd/Q=; b=mq28BbXitsS1kZOJZKqrXcodNVhCaAeGJcieKCkgZE0w+hEOovOieymKLd53Hvmwdj ZCtg7H9vKzpoTzBqjPhOO5qjKJjDfv5CJNstRPnOhc5PEImunidaQLU/HzOIXLv3ObRE qJXx0K/tImKa3B9wiePoBtAUdIYWxLyDZNdGzaX4ktRvo6aJ1fBXMleiX9+XAusr1jAk VxDSGo5n1kowrp/8aghsSuOXizYl06ayjm0fAlkUHpV/7356eNxTmIJCFjWJsphtgQn5 jXJKPcc4wxCpHWlZ1187UNfYQRvEu3xcXw54TrZjdUUlqXCYhKtvYanE57XPWYduEhXH dWKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=wjsUAAComu1E7rFx1ESKMnJu2Ixm3maECOUpSPdRd/Q=; b=hHqZGBreTPxBk2TzU3qje+H3KRCAtF5K5TwUPmLjg3uGCHY36oM1seE9ki9KR9FnJ+ KyhwcyP32Avl/mLahtNsohcLfZBfx6PgOAqHPBfWn34BMy/nUyXj4WemBf/BPoVwYMk2 m//gaqtONcA4JmfV9znp+ossnN3YVTx6W0LqBf0j6QS9xfXo729rkDeGLvSj0+GWG3cJ /Nu7Cbh5u+SdxHSHv33i/QwwjUf4ssFL/VF1WT08g+dMPgO3lZNWcbH5zy00l7TBkYOr 6z8q/+Q01ldyTtZ5XMSVrtQhB5W1sIyPhbyUx9YG8qTvMPJR1XzfjNGz8RgAuHOmnyV7 KUjQ== X-Gm-Message-State: ACrzQf0xS9VyNaM1bo79zBaC3W/0c8VHY9uzIZxwDefgUp+dr2GdiSRE 19d8jisNXGKgsHq/fAxRTrjgdg== X-Received: by 2002:a05:6402:3718:b0:453:a46c:386c with SMTP id ek24-20020a056402371800b00453a46c386cmr15308054edb.97.1663694142735; Tue, 20 Sep 2022 10:15:42 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e18-20020a50ec92000000b00448176872f7sm145777edr.81.2022.09.20.10.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:35 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1D2161FFBC; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Cleber Rosa , =?utf-8?q?P?= =?utf-8?q?hilippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , Cornelia Huck , qemu-s390x@nongnu.org (open list:S390 general arch...) Subject: [PULL 04/30] tests/avocado: add explicit timeout for s390 TCG tests Date: Tue, 20 Sep 2022 18:15:07 +0100 Message-Id: <20220920171533.1098094-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::532; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x532.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=unavailable 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We don't want to rely on the soon to be reduced default time. These tests are still slow for something we want to run in CI though. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-5-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index 67a24fe51c..4f07c27ac6 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -130,6 +130,8 @@ class BootLinuxS390X(LinuxTest): :avocado: tags=arch:s390x """ + timeout = 240 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_s390_ccw_virtio_tcg(self): """ From patchwork Tue Sep 20 17:15:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607641 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2042960pvb; Tue, 20 Sep 2022 14:49:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ezFvoDj/N6M+eitmSL8G0LZCHeOze9Qgic0ezSJvMsHrnwvh5kDFOY5N+XY4fq4wIBfUU X-Received: by 2002:a0c:b3c1:0:b0:4ac:bfe7:af9d with SMTP id b1-20020a0cb3c1000000b004acbfe7af9dmr21009096qvf.38.1663710576532; Tue, 20 Sep 2022 14:49:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710576; cv=none; d=google.com; s=arc-20160816; b=JJkZ4W41sE1lxuaC8yIqM65uf34P4b8KSzvezFt42tuKfSylVnMIdM+fDrpeOJ54VP yBkpdQRaGQPknrIe4K+TDRY1pYpX6dKoX8khKN7rRuaMv7pfV1gmTnKgQHRd3jEYsz0p QhosRDKHc7Q2QCVKRNjdCnHS1y5xjULdyrbAbTEm1/2qhZJVHs9j9nhXN5/BHj1a9O/C lhbhvPLNklt9Zzsm8GqcBkMg6kfhOmROfDZPuiY7+ZKlkehVJ4fkjXxyC0+4ZMrBgw/R nHnbQRhBZvaRy2taAafVs0ZzDOVngiwEUOetByHrC4kWy4vZ4N7BRp3oEVnl+shCjvDm xf1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ntf0o1o0k0Fp9R/q3eJsmYoFAtSQvEDfr5nhtPjCG70=; b=W5PfsJYsmO/Hvy49+DLa0KcJaVipoZOrsc9fWsdUwYy3MfqeR0pSvXqHzbwy1PH2gb 4hRXzk3zHCwn4cB8h8Fc6rxZXfMzO9WYnHdC5xyuNxqrxd39ik/EM1pM1hQLnwHK6L0p oV45c0NJI3nONw5MgtGl/2iyefDcZMrMfWil6dPtwpHUo2N4MPgsw5/Hz9sPjJjU+f64 EhrRB0AJYzznCtEcgq2nTXKIX3/rZCZm2ai3jVY2cO7GAR0Dxux+vQ0OaIcduMlBzdfW pFlANx/WEWe4ax2/Ow2TzIcfcyJsYqY/1pFki/MHGuw17EB1D3zYQO2BNAuqqS+H1lmJ p45g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="F61/0cH4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i26-20020ac860da000000b00346cd175066si493736qtm.176.2022.09.20.14.49.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:49:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="F61/0cH4"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal7Y-0002vb-43 for patch@linaro.org; Tue, 20 Sep 2022 17:49:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqd-0000XK-LQ for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:51 -0400 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]:37383) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqc-0000hT-4N for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:51 -0400 Received: by mail-ej1-x634.google.com with SMTP id a26so7832587ejc.4 for ; Tue, 20 Sep 2022 10:15:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=ntf0o1o0k0Fp9R/q3eJsmYoFAtSQvEDfr5nhtPjCG70=; b=F61/0cH47oOYiz0WiDXe1afjzPCi1PPLPtc3NFwA241fM9B8cDJ8abFQpmYp1Mi83L iFVvehZ6gKouskgxxZ7JnYi9Zlm6LEbSZUsl5CnMuiLlsV+IUE+Dqc+CcIVcleIJOsRo 6rYrewdL+7I5TpLIOK7Wg2Khs1PSI16YFqd7EQjAOHVHBXq+H7VlegcJlnns1PTkDG7j djqOPdtej55/ZRDzPWbfx4yVesPsaGLwYz7T36zsOeK9h45vRl7QrIfKssLxsk2rYE2n tdpTTmQ5mtRf72QqhBsiAcKzOWYTctaA2chCsGjeBfcMIbOGNsqdTgZgiLUCfA3BqiL1 Hiow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=ntf0o1o0k0Fp9R/q3eJsmYoFAtSQvEDfr5nhtPjCG70=; b=DgCGNSQo6C3OIyTYfPcNXpM75fi+MA1JOloBgPvClXh+DMpWuGtro1HoM3pPvYnSh5 9WTY1N9Mi6qd3MFP1Y5jE/rWTUN4TDQAJs1Rz+Cz/xcrrIfGPtKtb39aif787skssAc2 rY6hpvhouiNgL+rh8jA416AEypTMqz3lJKCeo+uEJBVfLHKAJlDSbb+JtiNyy5mJKObi flhUu05kUv2tnp4gGbCesM2kKdWcioGZVrH5GdsbjW6b/2r7bZKOndmFEoCPotlFLEgu TPy1fOAWkgmReO1hR/90tiKYDpsz95HB4td5Du9E2Zyi4spJKcYri5T7pYrLp+X97+9+ JZ1g== X-Gm-Message-State: ACrzQf2jd/ZHv64bcUAy15Ca3g5uxhwrLmxefUFUefqdS5QnSA1wF9Ww wOUhwZdZe6T1ou1+e1WKs3KOsA== X-Received: by 2002:a17:907:6096:b0:780:c085:21b4 with SMTP id ht22-20020a170907609600b00780c08521b4mr14402388ejc.293.1663694148034; Tue, 20 Sep 2022 10:15:48 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x14-20020a056402414e00b0043bea0a48d0sm214524eda.22.2022.09.20.10.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 332051FFBD; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 05/30] tests/avocado: add explicit timeout for ppc64le TCG tests Date: Tue, 20 Sep 2022 18:15:08 +0100 Message-Id: <20220920171533.1098094-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=alex.bennee@linaro.org; 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, 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We don't want to rely on the soon to be reduced default time. These tests are still slow for something we want to run in CI though. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-6-alex.bennee@linaro.org> diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index 4f07c27ac6..b7522ad3a1 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -115,6 +115,8 @@ class BootLinuxPPC64(LinuxTest): :avocado: tags=arch:ppc64 """ + timeout = 180 + def test_pseries_tcg(self): """ :avocado: tags=machine:pseries From patchwork Tue Sep 20 17:15:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607644 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2043843pvb; Tue, 20 Sep 2022 14:52:14 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4mH8qeTJbfekIl6YurJ6JgY7OFIKD2l5s1MfC/a+D/R3eLND0Xcfbt5A5UGCRJuDNAHA0v X-Received: by 2002:a05:620a:408e:b0:6cb:b4d2:a3bb with SMTP id f14-20020a05620a408e00b006cbb4d2a3bbmr18060021qko.110.1663710734302; Tue, 20 Sep 2022 14:52:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710734; cv=none; d=google.com; s=arc-20160816; b=P1jipfzygLZDuoyjeoTLExCxHUU7rogThLoCaERfkcssmVpg+xT7b7AKIGNJgrtarY eXVAf7CzXlwp6DUfCjjbJDKnCXifrRcGL1Jzovxgi09KU+zpt9S7ADRXrMUOS+Mca18s fjWZc3OshsN6wX04WULKgIGTUvp8kYImwqsEsgSRtQ0cHjjp5/edVTVc5vk9cGecWL+V IKPZQLkB1DLqarC6gerN0rQBYQDqxCfLlx9PLqHeMVSX1It9lk3paSXXkoQWVDI8XKUa 6pWccRRTqj6gXLCnnEpbJSZmrrlzAGGQ/ORm2mXFULvk6ifzGnLRwUqKmoxY2UV1O5Oc +T7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=U3PlFQUpVUZuVdYiZMbaG1H1/BKHYNeI1k/uhxlCRws=; b=O/D1TqPO0uH9XtNUwfyBVu+yyYU0TOaZIng8p53r+DbPpxt6yjCM6po5idHbGOum+2 wmVh3PQduxVCKEY9au5LD9rTmJ6ycd7gYnYwfLdqhnn/uXNCPGqzLWBMD5o33JfN151C XX6FkHwOQhu+a9cnFbkMXPHa/zp0dq9cmJQVzgydfJhziGrbrk1N9JepKiFJF+DOu5iV PmpYlxaZkSxFvcZZUFXT46uAvvSXyU8cwhWDfI6RU5VxkzNlZEjn8XGN1CmxIijtTBiq nULXRWcvtopZZWIeuveRzo8xFrJeR//EBlxiNLiKczG7ceh563nKkEiKTxe41/2ifF+P PVXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vWZlW5QQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hf22-20020a05622a609600b003430247335bsi433021qtb.624.2022.09.20.14.52.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:52:14 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vWZlW5QQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalA4-0000JI-Ru for patch@linaro.org; Tue, 20 Sep 2022 17:52:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqf-0000ZC-0B for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:53 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:38660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqc-0000hZ-NO for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:52 -0400 Received: by mail-ed1-x52e.google.com with SMTP id e17so4843968edc.5 for ; Tue, 20 Sep 2022 10:15:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=U3PlFQUpVUZuVdYiZMbaG1H1/BKHYNeI1k/uhxlCRws=; b=vWZlW5QQioRMdCtfh/efHRZSVEgVJ3TtGHluajIqDZyDPXBts8C4tjaBeOmvSmDYHc pqL8JPl7LElTNmTlk9txvpOfOkYDq27Kqrn+6muB6PqF3CqG7RkBS7LjNiYvmvzj4G59 poQrYS2h8QB2XGXQfSZc8QNpmB2bgM0nJSfbxD4aBkG7fvIV1CdQi0RlJozx/WHM36BJ /jwELjxgh/IOCnn4dBKHPQwrM2rp9zVWEtYJuytsDlirpWtL4MG41YQJ6mE+VxOulQlJ xt4DOQTR1FTuUSBRVAmOwe4z2zyG4HzxXA8dHIoHJOyfTUyI/juGoUAaE8IIqtxDiMRm 2yEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=U3PlFQUpVUZuVdYiZMbaG1H1/BKHYNeI1k/uhxlCRws=; b=1pKYWHE6+N/m8yD52W5mhKPMxoMgxVvqvIeqkp+M1JIYaUxi3UxN2e0Ye5IDEe+I6l O4IszUTu1ogmPQD7f63vQnIbs1QGTZ8cp7BZ3xy90M3zLrWzPuB4TdrZmFV/+AxclmC2 AC7MQLc9pK2wZQ2DItEQ5ZXnglqbWVyJijoVLYQ1InTkIOTym9fTwR33V2QqpkuIaGqT 7uvA4g1M8ZWIt0lqHJRXaFQoplTZdw4x6SPQQtp/K41Nlosyf9etJGQycYss2N1Dgi17 p07fCWCOoRhsACuIzC8AaC1bh5j6iS3PPE7Q2w+0zGn4QTDXFUWQwUJjPsr/EgYepaMz hZ4Q== X-Gm-Message-State: ACrzQf2hRIC0B6rni6X/ESuWa8MOOTgXrbZ3A/HlL7CoBA6P3MJQ4Hav WO5p/f0ldAmMF6UKPGVSKe1ZsA== X-Received: by 2002:a05:6402:791:b0:454:40f7:63e5 with SMTP id d17-20020a056402079100b0045440f763e5mr7380793edy.293.1663694149259; Tue, 20 Sep 2022 10:15:49 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t22-20020a056402021600b00443d657d8a4sm171599edv.61.2022.09.20.10.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4979B1FFBE; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 06/30] tests/avocado: split the AST2x00Machine classes Date: Tue, 20 Sep 2022 18:15:09 +0100 Message-Id: <20220920171533.1098094-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The SDK tests take a lot longer to run and hence need a longer timeout. As they run well over the 60 second maximum for CI lets also disable them for CI as well. I suspect they also suffer from the inability to detect the login prompt due to no newlines being processed. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-7-alex.bennee@linaro.org> diff --git a/tests/avocado/machine_aspeed.py b/tests/avocado/machine_aspeed.py index 65d38f4efa..0f64eb636c 100644 --- a/tests/avocado/machine_aspeed.py +++ b/tests/avocado/machine_aspeed.py @@ -6,12 +6,14 @@ # later. See the COPYING file in the top-level directory. import time +import os from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command from avocado_qemu import exec_command_and_wait_for_pattern from avocado.utils import archive +from avocado import skipIf class AST1030Machine(QemuSystemTest): @@ -176,6 +178,20 @@ def test_arm_ast2600_evb_builroot(self): self.do_test_arm_aspeed_buidroot_poweroff() +class AST2x00MachineSDK(QemuSystemTest): + + # FIXME: Although these tests boot a whole distro they are still + # slower than comparable machine models. There may be some + # optimisations which bring down the runtime. In the meantime they + # have generous timeouts and are disable for CI which aims for all + # tests to run in less than 60 seconds. + timeout = 240 + + def wait_for_console_pattern(self, success_message, vm=None): + wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + def do_test_arm_aspeed_sdk_start(self, image, cpu_id): self.vm.set_console() self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw', @@ -187,6 +203,7 @@ def do_test_arm_aspeed_sdk_start(self, image, cpu_id): self.wait_for_console_pattern('Starting kernel ...') self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id) + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2500_evb_sdk(self): """ :avocado: tags=arch:arm @@ -204,6 +221,7 @@ def test_arm_ast2500_evb_sdk(self): self.workdir + '/ast2500-default/image-bmc', '0x0') self.wait_for_console_pattern('ast2500-default login:') + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2600_evb_sdk(self): """ :avocado: tags=arch:arm From patchwork Tue Sep 20 17:15:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607636 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2040435pvb; Tue, 20 Sep 2022 14:41:20 -0700 (PDT) X-Google-Smtp-Source: AMsMyM568fK7a0v3fTu5yQpirjPsJPBi6d2N/DF81I/9Z5SyuVT+iM6kzrWqCwe+5uCJLgELUsom X-Received: by 2002:a05:622a:1829:b0:35b:b542:b593 with SMTP id t41-20020a05622a182900b0035bb542b593mr21363846qtc.471.1663710079905; Tue, 20 Sep 2022 14:41:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710079; cv=none; d=google.com; s=arc-20160816; b=lFHUCo7bk2ZR2JgDkgarpKVyfN+9x73kJxi3cDWlpxcFhZHxr4t18L4HXbWXSXYzKP iWYe9g9Ee3yayFcZNstXbv/eXf5OevdFPrOqVq9UYKZ7sIJyGFOfwdv22HI+iar9ARLn 7VZ83yHm+GDafJu64hkm17837ivoi2RmiDfG17I74dATb7YwHnnQGsouP02LgnS2zNIw rHi/L1EKiKoe73yMeieHXo3LdVdCBk6w47yzOl0tO/a5hL8f0lm+7PrAl+f8p0nZZCe8 9xQzva0s/GsV4rmA6+ZTtbFVV+DuJOPgGxGw6um+knii9UFt/b0sGPdgHwipgu/UtUcL Kffg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HAk1owhoyeWDT/goQ0xeRgqf6zzLI7dtllkknf7bW9w=; b=C4tJR69iypR8a+Vv7kfJwKGZ6sKPoxx4d0SACC6XsvRsvqEEGZGy9pi5G5FQEke3+a u80X/7WsaTE0C3V6arGbkE/WEwGVWcsMcmnl2GxyqrcLYEY1hKa7dq8cDoQYs4G2wgQL Xyxtfyzg+jD8IIO+QuI0otzakbRi5jbdFN7Od+9kLb4aO1hjHaOI9pULWmSFR+c1OpU8 ARSZXGpNRNAm1u+Hymh4Ez1+Ey+xvsQhhLjVe1m8BGm0a2bKb9l8BTX/oxQsK0Hb8UI7 +kbTJEu3rHCv+1aV+NVT61G6DlAD+1gR0dTjGkOjrcw/Pu7DSyVOlZpZU1S6qH/6jm1b 3PBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=utiXQbCD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q8-20020a05620a0d8800b006ce1bdff175si678113qkl.132.2022.09.20.14.41.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:41:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=utiXQbCD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakzX-0003WW-EW for patch@linaro.org; Tue, 20 Sep 2022 17:41:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41512) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqh-0000az-Iw for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:16:00 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:41860) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqg-0000iG-2d for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:55 -0400 Received: by mail-ej1-x629.google.com with SMTP id hy2so4106425ejc.8 for ; Tue, 20 Sep 2022 10:15:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=HAk1owhoyeWDT/goQ0xeRgqf6zzLI7dtllkknf7bW9w=; b=utiXQbCDdOUx1JV+d5f6iI+TPoyPZpLeoJPXEzb7TJKZjKwOBktd7PLWiawkKJGOrv MEakAuxGsVT2bPKhORNbdZ1sJSNi00ciZY+bJ2Fe6cqfC8oSZIQpJrVhWzWU8cm+OH8R GHTRd7QOXBnlvM7JqGzv6QFGq4lQQSybBiQRp/2y/Kmy6xMOOL2jbiQ77SK5lkfhal7n hsC6fx9Yso7SXFIsrS/OKwLDbpi3/9D4VdsxyQPvn0JunNM6eV7qMqi7gd4u26rzNK5/ DmZIetHpk8Iw8gn230XYDYMFEyxlXhwWkNFwDnFd1mPH8l1nQDbQyXCdqextCDktc0Uu /a3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=HAk1owhoyeWDT/goQ0xeRgqf6zzLI7dtllkknf7bW9w=; b=djGlufrvJ4j9EBCtVdYYxc3v3x2xuDpBNXzGvj8xxm9vHTGRM8vCJtdVayHB22fbVr 0Vm3MOdc4m/EWnk/7sgtjmUGxmRK8WYSWjN7VgXCBiLGIBSpOBGBGcdbzULqByWgAmEM I/Ug3eV1GX25EVP1+aSIQ8kZOws5yCpkFAlSOI8otcdV03ROE6XTsLM8UHnhcuUqAByl 15rZFJIG+R2lBAS0pfDf7y2VRu0ecGmXZb+wsmMeYBwd5WYag7p0WaJr6tGJBuWwIjwC J942yyhNVqRZqD5KhCjjN0kfWplQDKk4RODr9qk7h8+D4RrKibxqmK2NMAwSONfAsm4Z tvdg== X-Gm-Message-State: ACrzQf3kHJXoAUP/XL1IQcr5dSte7o13OIXk9HVhJuGAaPyRFrBQ+r6t 4bduqUYAM6tW0XM1KcrPlRMXcA== X-Received: by 2002:a17:907:6d28:b0:781:c4a3:4a08 with SMTP id sa40-20020a1709076d2800b00781c4a34a08mr3211271ejc.280.1663694152184; Tue, 20 Sep 2022 10:15:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v18-20020a170906293200b007341663d7ddsm163806ejd.96.2022.09.20.10.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:43 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5F5071FFBF; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 07/30] tests/avocado: reduce the default timeout to 120s Date: Tue, 20 Sep 2022 18:15:10 +0100 Message-Id: <20220920171533.1098094-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We should be aiming to keep our tests under 2 minutes so lets reduce the default timeout to that. Tests that we know take longer should explicitly set a longer timeout. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-8-alex.bennee@linaro.org> diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py index 5f1d3e551c..910f3ba1ea 100644 --- a/tests/avocado/avocado_qemu/__init__.py +++ b/tests/avocado/avocado_qemu/__init__.py @@ -229,7 +229,7 @@ def exec_command_and_wait_for_pattern(test, command, class QemuBaseTest(avocado.Test): # default timeout for all tests, can be overridden - timeout = 900 + timeout = 120 def _get_unique_tag_val(self, tag_name): """ From patchwork Tue Sep 20 17:15:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607648 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2045731pvb; Tue, 20 Sep 2022 14:58:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4dqIEtHey/L+V7rhMSTZ2ybqvH5jMwSBe/3QnpT037BDxRM9VaNUcuAT7uvmiQzrzlDVN8 X-Received: by 2002:ac8:7f06:0:b0:35c:f532:3346 with SMTP id f6-20020ac87f06000000b0035cf5323346mr6773244qtk.316.1663711122439; Tue, 20 Sep 2022 14:58:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663711122; cv=none; d=google.com; s=arc-20160816; b=UnW3i48YdXpULGmmrZ4mnvggSI4MWGxHnOi/2iJkMfTzEgNhP5W9zfnMFStM4H7mTo e1IZV/B6pogxcFT6ALWEvAKFNeQTa69yO1Eu0Tmr1N1M1sCrST/GoHNh5Fpg8XKyASGr 95VPEGUU86cFiLd4DSHesGYYTUwvsTNTdAainAFHrLl6+9807lRNHOgJiyEsc0gGrCdA P5PWCei6ZKoteoJRqmRjLSB4A7Docx56nughhJADD6qFws8KI2ZWSr6LPk4yfZN6/OLT YuDXPkDHgGncKDOOc91cE6qxiCzi6tYCkwiLRajzVqjnrL0+Q2YlrUhu7crvP4YzJTqJ KQUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=p614Yn9pYByJ8dTPq0j5fmlQHGdXVf6p9Jpw4u2AfOM=; b=EakrERYXhnzwm2aFk0vsO6PR2T5J7ZvbqsNwoeEp1XIQGWBfskGFxaMRV3LqHKs716 W1cejmDq5FgzhkZPUR4Mgjeg/wmKKhvlYwBxBWEdwRIYcNe6+nUWzGOwLN7/5tTPy2NL A6tesI2DJ5Ux+ljPV7rN95dO9AsQc2cTpyynXLkJyFwyOLbmlpGkRzKqhIveOyrP0tfc gLMLGuMG5s7IJHO31RFQBMGyfgGKgmzw1ELPZoqOO5OiehKgXxpJn8e9tD5QEu9Mutcu 7f555rHvubF63iI9NxZLybvwckD2DqoyDdLGwkV1lJeMHyioW3C8P9TeQpudfWXwW1DN HrMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rsTs9W5u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cg10-20020a05622a408a00b0035bb23f0d47si501608qtb.157.2022.09.20.14.58.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:58:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rsTs9W5u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalGM-0005CJ-0d for patch@linaro.org; Tue, 20 Sep 2022 17:58:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqg-0000Zv-9p for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:54 -0400 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]:39513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqe-0000hx-1Z for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:53 -0400 Received: by mail-ej1-x62b.google.com with SMTP id y17so7815517ejo.6 for ; Tue, 20 Sep 2022 10:15:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=p614Yn9pYByJ8dTPq0j5fmlQHGdXVf6p9Jpw4u2AfOM=; b=rsTs9W5uethv/Sr0uDbnhCiJmW7HA9ZFJjGO5OZCTajvbfBSM7IA+98f7B9RC1WBNX lbT6Vo1QkgCGQXiQ0hj5ZFugR/oluryxrBGgL0/JfQW2273Ftw4Ki2BiHHLVGrndTu3z pfqt2j9WQW3Jh3ConOjLvqrfftiwR4KvpJFsQeMuSXYEPZnRWvTC/LRBIfiQwkMOtVIO 0HpZR1lXiTDR/U764IAz9VlmBxITeTlmprIVa0thOUh9fJZ82HsTs+gxvEQEoa/u2iaB DVVXdL4n3Zx0BNLsWbs/HN9lXzXQ8oFv3Pe8DsooVeGkmXDs/5rMqx2REdvU9BSWVfOG w4Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=p614Yn9pYByJ8dTPq0j5fmlQHGdXVf6p9Jpw4u2AfOM=; b=TiOrAuBOZEEd4xyDSwUqaffjKlXwGz/K3ladZvWRCsP4XOaG+e2eMlIAdPa6kPVaLc oPTnss9nXrD3pdIDKhAwKwBsE/D8ovPHJrdA9kJrzmUSDtm/mjAor4JF8FHzKkdY24Qh VRL0gEzOD2dJhwhK91l8E4JtiF2y6vVKIhNaJh6ZNGU+SKueUjRa8Pgzs4K5GKnmhnqq ePTFyoaHnAft4doi/wNp81DfZ+JO0B1FAO0ZV2NROpVT4OfpGYWTGNpAFcaR90GlGckv 2AMnswHYg3P7Y0nXYiD8zLYGI0VsLEESkQEaxbsfs1c5WbXPiot2ivwULhF9EubYBaiH f0Sg== X-Gm-Message-State: ACrzQf2edK52Uc27sVw3OPcJTTLLWIcQsW8YNHjKxUt2MK2CV+jLGXqY dzWHPScyNrRZfld27RXpwiFLOw== X-Received: by 2002:a17:906:5d0a:b0:780:3c42:990f with SMTP id g10-20020a1709065d0a00b007803c42990fmr17961365ejt.9.1663694150605; Tue, 20 Sep 2022 10:15:50 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d14-20020a50fe8e000000b0043bbb3535d6sm164518edt.66.2022.09.20.10.15.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7B6C71FFC0; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 08/30] tests/docker: update and flatten debian-alpha-cross Date: Tue, 20 Sep 2022 18:15:11 +0100 Message-Id: <20220920171533.1098094-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62b.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-9-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 505b267542..802e332205 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -1,7 +1,6 @@ alpha-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-alpha-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9a45e8890b..c565aa5e7b 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker index 10fe30df0d..4eeb43c78a 100644 --- a/tests/docker/dockerfiles/debian-alpha-cross.docker +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-alpha-linux-gnu \ libc6.1-dev-alpha-cross From patchwork Tue Sep 20 17:15:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607650 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2047384pvb; Tue, 20 Sep 2022 15:02:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM68K+PPL8ofsSklZYhnyNypv1QsqR0HP6tLTQ25zmrx2++Z4cksx0MKqrv4SANUTWNet+BN X-Received: by 2002:ae9:e119:0:b0:6ce:2d58:be71 with SMTP id g25-20020ae9e119000000b006ce2d58be71mr18092417qkm.637.1663711330466; Tue, 20 Sep 2022 15:02:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663711330; cv=none; d=google.com; s=arc-20160816; b=EHz8Bb3GuJpnZH6/AUnfb1tLGPUPIPDnp3cXOQB4I4xgum+1AEHbDQFaWT8n4sYZBf Tu2RDMNpWYk4vCgEcVQAr9wnJjqBHN+XR+RVgVaLUPQHFSAz4KlYOUhqdAosuyewZoc1 C3AbDoMM7Rm99aJwz3vmqjWj6LsQBf+egJtl+PJwE3NDEgmvJKfzSzQqFFiHd8a/vs3K RdRcGAwWu5qSSl3Inbkn4Zix//5i35s0CTlLGBzXMZ5CVmGlCxSmkQnVD2g+6QVYKPkK Df0meGcRAyTZdlONV0g455JH5TR1O6sXJCq7JGQynGONqJpOH0RroZyovBnT2lQcHUdM /jSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kgOtjYfIt+ylJV73NEowm0ceMrq4o4dFJuDidaHM5To=; b=lT5l8XSROuWOoM3RRq5hIvHVbJHWgB1v4oJJ5HxR4n4u19yxqxIs196nd+Uwwjfrvi oBI/6cwsWSypUDaQSbk7qvqRr8snHOLe/fNC66cYhhxlxhmxA5OFPbWVBKaC1W2FDQQ2 FQ1SzyFUWlLMfBmVLybPfYAl+uRw6j50eGaHQMfaTRz8953JMgbgPgLwblgt7HKWaG25 6v/OBu/qhCruEAN4puVFDmqcZb5/NUFTs7edQDLdjcQrY4xjFX2YCYInGBPDx914cBMU yR/HDl8vofHLx5QnJx4XZWMl6YHlULygsaniNoiYkAyfPqJUwVfYZVSSJAQZEV3o15tA f32g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F2nUPLK8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h1-20020a05620a400100b006b5e8842d7bsi767858qko.114.2022.09.20.15.02.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:02:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F2nUPLK8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50758 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalJh-0002aX-Uf for patch@linaro.org; Tue, 20 Sep 2022 18:02:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqj-0000b3-1G for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:16:00 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:43821) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqh-0000ii-Gl for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:56 -0400 Received: by mail-ej1-x629.google.com with SMTP id lh5so7754877ejb.10 for ; Tue, 20 Sep 2022 10:15:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=kgOtjYfIt+ylJV73NEowm0ceMrq4o4dFJuDidaHM5To=; b=F2nUPLK8zfJyr86IVAOceQrKpw9rbGkAWVTf1TVzguqH/EOBIIIt+jTXec9SNf7nD+ qW5pK6ZZLiytc3par8qifQmFElMTVsb2skAgQtyZQhskUX8BsaMgnypGpLCS7/dBR/J8 L7fI+HrVjAmJ1XqicImIX+PI+BYJW2cDbINshaHltMp7FBe1HlBqLM1wzdvqws2vLJGQ 61M5RwHpzVRopB41ZAHQIMuDaVrOkk0x9DXW2Cbiov2c8HbI4fAmpUcxeltje7GPcxwn 4npwKCSE3oERHy78usxB/PR0VIEFMBFBJO+zVgUNFkyJayrRNN57/nzioKyEAUgmnjal lj/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=kgOtjYfIt+ylJV73NEowm0ceMrq4o4dFJuDidaHM5To=; b=uTvAnCuE2WWXVzvxW79kpOaODJSNIjjNB2DeLdxsxB7ibWS4c8LORdTkE2wRCCq22J d+U6gEaGzBqI4li/vVVHfzRcPEs1mzIJlrw3jhjYejEWS/InkifzVSevyELNT7KxKYIL +bFR3zHrdBL6mzHpwp2jHQNrejFoN8cIZ/9WM8fNaTq9N6aDQRrPmvt/HB6Ulrg5it8P IB85aZvwS0QPzZU5cjqh3jraeRwK5hcdnvPJKdlMBxNc5pSD6xCDG6IosB7W8X1x+CnF z0WWvi5s939VUieiLYFAx8a3kyzhx2iYtYlgHw/ClxdXBlnnDPel4L+Bx6mI33dFT66D PNCg== X-Gm-Message-State: ACrzQf0zhsGBHc+c9ZckRHDPmewmGp9gp+8U3ElLN+KurkUTOa2JbZ3k qThp1H1sv4L0DXCfifZvZTZPcQ== X-Received: by 2002:a17:906:7f03:b0:781:6462:4214 with SMTP id d3-20020a1709067f0300b0078164624214mr7764544ejr.274.1663694154053; Tue, 20 Sep 2022 10:15:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o10-20020a170906768a00b00781e7d364ebsm134186ejm.144.2022.09.20.10.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 957091FFC1; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 09/30] tests/docker: update and flatten debian-hppa-cross Date: Tue, 20 Sep 2022 18:15:12 +0100 Message-Id: <20220920171533.1098094-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-10-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 802e332205..6c1d765463 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -65,7 +65,6 @@ hexagon-cross-container: hppa-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-hppa-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c565aa5e7b..e39597d35c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker index 3d6c65a3ef..af1c8403d8 100644 --- a/tests/docker/dockerfiles/debian-hppa-cross.docker +++ b/tests/docker/dockerfiles/debian-hppa-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-hppa-linux-gnu \ libc6-dev-hppa-cross From patchwork Tue Sep 20 17:15:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607646 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2044950pvb; Tue, 20 Sep 2022 14:55:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4v2sl/u0F2eCVEcj6jLocaodc+DA89bLz/i1puNhlhNe9Z5nku5wDGmyf0ryzHsKQpajGo X-Received: by 2002:a05:6214:20ac:b0:4ad:79d:dde5 with SMTP id 12-20020a05621420ac00b004ad079ddde5mr21351413qvd.76.1663710934704; Tue, 20 Sep 2022 14:55:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710934; cv=none; d=google.com; s=arc-20160816; b=UEHGDa6VZZta3NSu1CKn9CIvryw7BaY6jS5Z3CpyzSsDkurRlkoctlswZWVRl/EYbH MpjFiuW++JDA5+c32gvTxc6epw9sscrzQD5EBO/X8Q+A+mUQ/cOc9O2Dq1b2xXTW1jgM g2CDStcpghRzZ0o/Akt9SNTejINB/1ZSx0lxb8Io6MygE82twHr4sW04z2CLEYQL+yTi KtrgEkNg1fi7oqhRcm/WvZspDzazN1L9XcV2QgwJ2kODlKBBG7+UnlP2kLPJHcedBIvF fBQBFyA/puSpoh9rpMPMapgut9QX302OAcVU25EEvTbch2jRRQz9nqCltwMEr5rBBiwJ N5wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oHx+ujubQ51Z4+UiDF4O14qPW1hIAG2/bzHjOZXayMc=; b=EBNVjBDN4JsDcuZgxs5l5EwvrfZiP9oH86YNko5sT4ie5BBA9WnEBoztZc5qSbvI2a s/anshdXp7Lgg/BvSp1QxJFSnRd9ciHfhkvfrSR8c7Gy7ahhYeUGqeBZTvWztHUESgZj tOSHvdmtbupXrAlEZ2d8WfrcF+UmlCQLxi2offi30FxajoXS5XvDUYk2CuOuOITmkWAV vodCmcAGJyV4F5Qf6V9XlatZ5ojUR/0oChSOhVaGTZpRaHxFaciQH29tOvjmlXN5OXJn 5dOhmiMTgzXIJoK50Jkob7whZa9PaCdkwWgpF5DrD/wTzEcfHfRP3M/8dVqaJu707wCB jmrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S3cBc+06; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l20-20020a05622a175400b0035cd10e3cd0si470501qtk.684.2022.09.20.14.55.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:55:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S3cBc+06; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalDK-0006Fl-0J for patch@linaro.org; Tue, 20 Sep 2022 17:55:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqm-0000cX-Ld for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:16:02 -0400 Received: from mail-ed1-x52a.google.com ([2a00:1450:4864:20::52a]:44713) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagql-0000jE-1L for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:16:00 -0400 Received: by mail-ed1-x52a.google.com with SMTP id x94so4800599ede.11 for ; Tue, 20 Sep 2022 10:15:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=oHx+ujubQ51Z4+UiDF4O14qPW1hIAG2/bzHjOZXayMc=; b=S3cBc+06GDtSDcYz6l2KzUYM/8pGG/ljlsyHCpuxaAwWg6R4l9I6p3vhUF4rAeO/wh 2/w1pW11j4imFXXvu1Fblf3+Qj82ZCz72mvVW5Au7HykWj1Y4AQgO6qAZHWYKszU1UJ6 MY6SOXLkLXlW+0kBIFdL6XQeVfQFvj9KLMKfx4Pk+xqrVYCFS5uAMmRLd3B0ANpHo82M igg9ndvIkkXWQe1HbM7Ll4JXuYvrJdVlwwOSa3Rgb41PzZAkW9mWS46HJ/qgXFt6hRTH XUm/DakQ5XT/8Q8CN4k8KNOj7mwmlj2bVDNYLvX8qtRovsGzjU5fgikQpOrHkv3AzHID xWGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=oHx+ujubQ51Z4+UiDF4O14qPW1hIAG2/bzHjOZXayMc=; b=EUQcZriMO4rF2Sv+3kFQ9n8gWlaOnucL5CncxgCB5HuovuAZqz+ty0AZ1raXyCsm11 fU9Tp2YZKGczxQxp3ybB7EOy17qYCNPnzj1Zz28Zr+rnpM7mvQwyud/uoCjYDYaLs+Q7 yXEGJ5oV1PhhZOvcjdHUN0MxnTAFycColFmOvnaNOCRNu/0/lE9421qAt0li9FmpusYM l2Bg5eTA9Drtr1nEK66cGtjBIN2BOVpCnKVMOqwcwJtbwIeyFQzRrAaOEwz2EkZmZS5k 9ZF2rBrfqCS//DTAZOg/dd3NqkF2+WRKlfER0yipNXtQ9M1SAxOUR307kF1m6cB9yGC3 34gg== X-Gm-Message-State: ACrzQf0RSXqGrEKlJ+Fn4taTUlSTZT60a5TMdtqX8T1LVYy6ZA6sMfo9 HsRgcCZHZYdGZ41GByRO8vOCzQ== X-Received: by 2002:a05:6402:3550:b0:451:473a:5ca3 with SMTP id f16-20020a056402355000b00451473a5ca3mr21171346edd.48.1663694157660; Tue, 20 Sep 2022 10:15:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id 25-20020a170906319900b0073ae9ba9ba8sm205943ejy.3.2022.09.20.10.15.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AFD051FFC2; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 10/30] tests/docker: update and flatten debian-m68k-cross Date: Tue, 20 Sep 2022 18:15:13 +0100 Message-Id: <20220920171533.1098094-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52a; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52a.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-11-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 6c1d765463..15a5270f6d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -71,7 +71,6 @@ hppa-debian-cross-container: m68k-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-m68k-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e39597d35c..95790e974e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker index fcb10e3534..dded71c5d2 100644 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ b/tests/docker/dockerfiles/debian-m68k-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-m68k-linux-gnu \ libc6-dev-m68k-cross From patchwork Tue Sep 20 17:15:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607632 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2030974pvb; Tue, 20 Sep 2022 14:16:42 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6pq3meACe0b7xj6R2C8XhdGGpFxSN/CictpnQZzHiKkDcCxPOAakBdeQpZNhxoyZbrscle X-Received: by 2002:ac8:5b56:0:b0:35a:7214:8e0 with SMTP id n22-20020ac85b56000000b0035a721408e0mr20794025qtw.682.1663708602594; Tue, 20 Sep 2022 14:16:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663708602; cv=none; d=google.com; s=arc-20160816; b=qJiPnZ2UCiI/RKhthqbDS/RIc83Jmf8AwKQ7zL78KMMUmKiuMhToY3SASis3dYUHfB ahtVVijy+4sNmA0ofH8NpSs+c9PMl8TeIiSYYaAly+8XYU9YaFCyO2GBAP/OIsPNJglf N5RnWWS7P6eKqMcbZD78UC0i7n1I9bCQdwMRbRa2Ah/hfkY5FFIkx1JAf4+ohp4Fzaxu SIdX95Di5qGzguqa3MILpEDiPnUiElUnFlk3Ghndhsa2AgjvgecqE4AOU2yZ04kINhXA M6SXFIFWOQkqn4WQP2rYUzJlvxJ076PNGeWaJuch6uhBx3WPROeJpV4jZN52xd6/6fkX 6Vgw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pAX7EzPv2yIW/JjQbt45KialnMqV89oGUWLI/H7OpIY=; b=z3mPraJrxry8W2TVue/JtQD35GK62x8VXY1+Jt+3TFIr7AdQVgJZ80RqS3Wlu0/AU2 /f2s2YSh8dd13+Hel5sjDmJyGf37IzjdnszZHG0K9Mp6eq3CtEaZDjp0kXBsfIY5ILtX 3+9nAfJVdSe3/NFRk0EI6fO88oVHxD04QtYORtyGUFb7mjjqycJr2P4k+jxt44qoyHHp HT5TTTIJW0fSB9hcAb7+noDuiNW61HYmX8A8x16rAu7YM1lNAcKvVl//BdoSZUDpcaDZ tjb/BpKqlBAnH+EuGa0j/kMOzvWFWBIYHx+sGarzubI6MWY5ucy3DseCmNsaKd+s87Lu kyhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Gp+g3a/b"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id do48-20020a05620a2b3000b006ce6eeabb11si590619qkb.375.2022.09.20.14.16.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:16:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Gp+g3a/b"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakbi-00028H-4r for patch@linaro.org; Tue, 20 Sep 2022 17:16:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqk-0000b6-L2 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:16:00 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:46914) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqj-0000iy-2n for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:15:58 -0400 Received: by mail-ej1-x62d.google.com with SMTP id bj12so7712823ejb.13 for ; Tue, 20 Sep 2022 10:15:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=pAX7EzPv2yIW/JjQbt45KialnMqV89oGUWLI/H7OpIY=; b=Gp+g3a/bpteYwODI0F+4/Uhd9HNY3fnEi+GRIhglVutVV4cpeQUcXKzXbTjfwAz+c8 Q2xACP0c5GixiJGXgnBbYMYuwYZQOeyRg/cVayM4dwonz5A3bKFBhZrD1/woiIpoVAbx mkvloiop0f4pS36snRHXpO31pTTkUvQFZz6QLKjTuTGl/hVVo+fmErdCxh2DgYcbvxeR m32Ix0EtmzZZCtkn3wrS0CI1ZRPlheB8QuonWtZbuXGLPh7/h2v+RdOOuFsLt0KpxNkg wP6MJAfcrOPQI36TkImhqWzUFEjCFBCqN3ecq2WKXodqPib9hpaWUkIDRqQc/UHs+aMA YkcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=pAX7EzPv2yIW/JjQbt45KialnMqV89oGUWLI/H7OpIY=; b=005kf2N73t2ZMPd4kEMj4iegGxDvqfWdKILP/FZWh2KdgLWA9RoiPeD5l6aGkuAcvf Z4p6NPaOzAtdrLbW+ztC5nznGHgT05CHkCLLj58ES9XWn453ju+7Y8eot0CByZ4DBmQw gQcZf53E5ZJAZoBTnk8r7vEKaKvOfjRMEzpa65BBnQoBwMAbhei4UwU7gMrl9EVlPKb8 TyNXoND33VCF/Zt8MSIWTMv2PS4as4wo+sMmeet2sQkOePjB53IHqKsvCNq1AHsnY2yQ +/hZxc4WqFxq+D8fyLVUav+ghEbRaVSSk77pR+TKuKEiX+/F4aF2tekmFjkcfnLqhUez hp1A== X-Gm-Message-State: ACrzQf0t+t7n2/Lfb0hTaTqGrhXyCefpF6Rv53PlCMEY/iEtRbazgsir bnS1oZa+KajBuTC6ez+1ido6Rg== X-Received: by 2002:a17:906:6a14:b0:774:a998:d9a2 with SMTP id qw20-20020a1709066a1400b00774a998d9a2mr17257101ejc.496.1663694155480; Tue, 20 Sep 2022 10:15:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x16-20020aa7dad0000000b004548dfb895asm213509eds.34.2022.09.20.10.15.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:45 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CB28F1FFC3; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , Jiaxun Yang Subject: [PULL 11/30] tests/docker: update and flatten debian-mips64-cross Date: Tue, 20 Sep 2022 18:15:14 +0100 Message-Id: <20220920171533.1098094-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=alex.bennee@linaro.org; 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, 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-12-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 15a5270f6d..a3bfa483bf 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -77,7 +77,6 @@ m68k-debian-cross-container: mips64-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-mips64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 95790e974e..6c2ee3b175 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora endif docker-image-debian-mips-cross: docker-image-debian10 -docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker index 09c2ba584e..afcff9726f 100644 --- a/tests/docker/dockerfiles/debian-mips64-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mips64-linux-gnuabi64 \ libc6-dev-mips64-cross From patchwork Tue Sep 20 17:15:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607635 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2035551pvb; Tue, 20 Sep 2022 14:28:26 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7LiLtOJ4mQEdZ1y4tJ5WMefoMD90ffjEuLVO/k66dLI4zmp18VfAf77YjKnc3bghj0OTJh X-Received: by 2002:a05:622a:1891:b0:35b:b0bb:69b with SMTP id v17-20020a05622a189100b0035bb0bb069bmr20749794qtc.396.1663709306270; Tue, 20 Sep 2022 14:28:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663709306; cv=none; d=google.com; s=arc-20160816; b=L8sRXRs1BS1EFFs6ADwzNhXjCxr+0tB0DwPz3acALJE/Z2+fPCGTxwHUkIGJ7pEIRC Ab174ecFWg5y9QatboKbnGCaLPeLohaUkJMZVjcKA2+UogHnygOj3i3xUDE3l2dcunGe ba1inJsu/1AWASOFPzTjbRDfDkM3q5+QXQHutkjdgNnAG8xbBbRI+MhRlu38VImebt2M HQ4u2SGShJYtk44n2hehnIrjYJxOqxNR520XxgLwi0i2cr5qtqNlZnJdpqRgi0v8H3s2 hwsMOM4R2SnoO9PcwO/AMCujbxoWg6uyuzDreCwC/ILCYVUwCBjqZ1bhpMf0isTIv0qU IlGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FCp0ZhdcLPVYE2rXlJfbfkU6sxhsi+xnGbJPXBfntxo=; b=LTMsbYxN72jy0l1UU4yUpnrQfQPPdrXdESj7bRVHsCCwMK7z17u4lfeht9lxoeR2uW AQPIE0TID8DYGcye1H9GPxMgv5pjK1BSpuASuGZe8NPoMJOqEuq5yoV1g4iTwybo2AYE YN6KfVP7VJdpDryhMz3zkXqNZh8UwHcd4/vK58v0rEyCUxmX1UQDkcbGesd/MZzmBDel CFS5UX2iQwqpeOQWSQOEaDZiX/6iW0DtH/WGj2XMW0G4da+d5dFPvYS9iLHYTNhMbugf LbD7ipaLQOC+u2L4yZY8DYwQqWpCiT24RgpDAMBH0mQAXbWHqZgxcmYX3Yh/vP2M0LbA qAdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vC5HU+gg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bv7-20020a05622a0a0700b0035cc0524514si490816qtb.97.2022.09.20.14.28.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:28:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vC5HU+gg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakn3-0002fJ-Os for patch@linaro.org; Tue, 20 Sep 2022 17:28:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzd-00062I-2I for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:09 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:39849) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzZ-000208-JN for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:08 -0400 Received: by mail-ed1-x531.google.com with SMTP id f20so4867470edf.6 for ; Tue, 20 Sep 2022 10:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=FCp0ZhdcLPVYE2rXlJfbfkU6sxhsi+xnGbJPXBfntxo=; b=vC5HU+ggUYZaLzkjLtyK/sIDCmA67JJdotLk69w2djB8KVhMdGlNGv4Qj8pmTfYd8T kJTiby/pEt4bkWkU/ORl/VfHBvSgOSyB5G6032Jq7Hh6h1dPyk9D9gjjIQ63GiRhfsP7 zrONnNQvVafDzRrBfF8tQOWodTQbQufzqrfYWys+2P5wg4LEnJKiEhR8zfL3xh0PvtAv ATpCrxxOsdzCtysVJK4xEg7RZVe99fLMILPC2roRHDgITlNc+MDuV6Iif3I++hz9bRED XoUt2t1KraDKK2t87l13ylQhE9InTlZz8pQlw9t0clXpuSV78M+8UbffObpHV13RTHak 6bYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=FCp0ZhdcLPVYE2rXlJfbfkU6sxhsi+xnGbJPXBfntxo=; b=wKL/3Tvd9AlBt4sx+to8T7ilZ6yD2B3IKhLHNO9ZIDwcWxlMgbziSHErvHpN1yATix y4VK3ueA85EPaqni0isx8TvOU/PCUeT5rcw8OYDFGfNHzYGQQ9qVeOAnjjKXROPGWXed R5sjCA00lk/ylNmuxcxLc9RyAO8g8n6B0kMY8xra+k9zlox5K7QC98BG1Qr8LUan8AGo IiA2mif9GtxdLR9/+0OFwGivUQ7C3nFEAJ0cYcsfBET28Fv7b5rRW++i3xuxxQiMcJYl aqsUH5QRagkQIxAVoWRKOsvSmzknZFHIXXB0Lwg+PR7rvYuRXMrv/5XDk+YP6dYjipN5 2C6Q== X-Gm-Message-State: ACrzQf2hRMJv15wV2To11wD92l7b814Ukbv3T9Tv80sP7Gq3NOBqhHsA MObnGCuyHfrPnDGrLZYbkvxl0koEeU/75w== X-Received: by 2002:a05:6402:1cc5:b0:453:ed3f:6a38 with SMTP id ds5-20020a0564021cc500b00453ed3f6a38mr11352385edb.346.1663694704231; Tue, 20 Sep 2022 10:25:04 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id 25-20020a170906319900b0073ae9ba9ba8sm216903ejy.3.2022.09.20.10.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E72111FFC4; Tue, 20 Sep 2022 18:15:34 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 12/30] tests/docker: update and flatten debian-sh4-cross Date: Tue, 20 Sep 2022 18:15:15 +0100 Message-Id: <20220920171533.1098094-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::531; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x531.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-13-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index a3bfa483bf..8a611fc824 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -137,7 +137,6 @@ s390x-debian-cross-container: sh4-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-sh4-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 6c2ee3b175..37c4ea913f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora endif docker-image-debian-mips-cross: docker-image-debian10 -docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 # The native build should never use the registry diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docker/dockerfiles/debian-sh4-cross.docker index fd3af89575..d48ed9065f 100644 --- a/tests/docker/dockerfiles/debian-sh4-cross.docker +++ b/tests/docker/dockerfiles/debian-sh4-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-sh4-linux-gnu \ libc6-dev-sh4-cross From patchwork Tue Sep 20 17:15:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607640 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2042288pvb; Tue, 20 Sep 2022 14:47:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5ukPwfXsEse07Jo4CUMq0EYsP8PaKm+3vPEtq5hy9+2X0reDlV7mEe4RCCYdQ6DUA+EYn4 X-Received: by 2002:a37:a943:0:b0:6ce:731:997b with SMTP id s64-20020a37a943000000b006ce0731997bmr17717356qke.344.1663710443639; Tue, 20 Sep 2022 14:47:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710443; cv=none; d=google.com; s=arc-20160816; b=TjbD9BE2migwHCXZYMwasnzbQQVxgS6kJR87nuvr7+iEfH6lleVE45WaMjY+nC9Z7K yDvp4s2H8VFHwBGcW77NCthM6SQ2qwhruzek4gQz17DNMo2QQx0BlSju37q04vRutnj6 Xn8bRf+I3F4sJmdZjH8sXycMciHF65WGFbix4RZb8XvTN55OxmFzK3+F7C5BxC0g4ez5 vuc8sMMysekBsXALH3KJJJ1vb+2G4Xd3/W5pdFtFMEp6aXeyl5qiAzWrlTlDSU34XWwj zjKO9/qD7WfD/p7BsaftI7YnB3wwk7TmiSUdMfmsNPCGAN3Akg0waKjmZyNHVsLjr/ul BPjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=lGP32FeNcGkLN1t0VFLZXvScNyvJq9qr7BUy9LY4/aQ=; b=AC2NDDxuNADcDvGbw3Q1QdcArY9s0CXFbAFFLpAHotVSYxPdFg3vpWUXMUDKYf6Bt/ tnLNIn8LjF1vkrpncaD+darox2vFSQd8j6Q0cIZqKDQmobDNpkx97Mja7z6+q/DCqBDK eUC9ciPeyyV381J6kAPBNTvIKeUaGlaharxoWp3/qy2cBT2NejB+vGexW2c1fun5chCV LHEIKUASQ7RZZ5YmbjG/W+ZPQ6wS2sR3zyWWSbM+hn3TCCXg/T/Y8Lcuy1TVd0J4fi0G ou+3rVpm8Abs/8IDnyd01BfDgjrvQBUxg3fHGyFrkUFPr2rgBDsOLCTIz9Q5MhxJ//no fyLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E4mDEK+O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q18-20020a37f712000000b006be7216eabesi540318qkj.530.2022.09.20.14.47.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:47:23 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=E4mDEK+O; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal5P-0007SN-5s for patch@linaro.org; Tue, 20 Sep 2022 17:47:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzQ-0005fT-0O for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:56 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:45568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzO-0001nE-8U for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:55 -0400 Received: by mail-ej1-x62c.google.com with SMTP id dv25so7763065ejb.12 for ; Tue, 20 Sep 2022 10:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=lGP32FeNcGkLN1t0VFLZXvScNyvJq9qr7BUy9LY4/aQ=; b=E4mDEK+OKb7Wre34iiO/oJwScIXh4aML9KfAm/ef3LeftSxfV9Jzo98RelgCCslG3U yDQcJ3bKH1J8zMSjXkfYv8X5+loykC/yNp/BPyc+WwjzbQooBWgNkC5BOr0WQKItJK55 TrPJqjeVDsv3aR540HXhtuNAw9c0DuH+RlzscOxgV5WJtZYJqoztM1/aCLxRJK0D+b22 3kvtKVjZxqF44xB4fdpdtGAThBGnpsNHIzMNiMneuu6FRez9yECTzCpfNdeRa4fM5wrU 22wqX3Rr8sdBod7MWp/etW7zH319kMVahqrdTPFprB2pU5K2mj2rqN+uVjJawxS5pLfe haYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=lGP32FeNcGkLN1t0VFLZXvScNyvJq9qr7BUy9LY4/aQ=; b=8JcdgLPHSablNSXq300bvS4f5bRKLuNuttZ0P+gxjva9/7gBeYe1yRRU11fjlKV/HK 6YvHVt3meH1VIudGxgn2u1PCWoYNdvxcLh13fg8NhVyvj2rc24f31yDa/tpbcC6xxgNT WN8jI8UHx+3NZePgVC8Vr4b6cGXGArfOtPHIa2j5lb8ETGBYmjR0ZAZGyzd9om6omZbv 9ankd4+8L3WtU8TzdIJOutjjQe6sPmBfBpFxYSP1pSEa2HRu0BXkzhOkUfV0KJnX2IU8 iL/4pX90K1gmH1/VwmJ4dStW8pprSVizaqNJlDRLqCYK37Lh95WMxuxOMpXTXHjbhXL3 8RwA== X-Gm-Message-State: ACrzQf09tSPnuxBef/klXWLG+Zr1pvJROp+EOgL1CFZeILqTsluL07at TB82NAvrSmiUfskhWiz4gj2k6g== X-Received: by 2002:a17:907:a043:b0:781:293d:ea89 with SMTP id gz3-20020a170907a04300b00781293dea89mr10321826ejc.461.1663694692535; Tue, 20 Sep 2022 10:24:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id ec42-20020a0564020d6a00b0045393e56488sm200375edb.58.2022.09.20.10.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0DD361FFC5; Tue, 20 Sep 2022 18:15:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 13/30] tests/docker: update and flatten debian-sparc64-cross Date: Tue, 20 Sep 2022 18:15:16 +0100 Message-Id: <20220920171533.1098094-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-14-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 8a611fc824..db0ea15d0d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -143,7 +143,6 @@ sh4-debian-cross-container: sparc64-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-sparc64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 37c4ea913f..8828b6b8fa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora endif docker-image-debian-mips-cross: docker-image-debian10 -docker-image-debian-sparc64-cross: docker-image-debian10 # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/docker/dockerfiles/debian-sparc64-cross.docker index f4bb9b561c..8d3d306bc1 100644 --- a/tests/docker/dockerfiles/debian-sparc64-cross.docker +++ b/tests/docker/dockerfiles/debian-sparc64-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-sparc64-linux-gnu \ libc6-dev-sparc64-cross From patchwork Tue Sep 20 17:15:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607661 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2067793pvb; Tue, 20 Sep 2022 15:58:32 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6NhZLjm3wkc67wmSEGOdppgL4iGfAE3ND33n8vCDC3dCZcMdCltra3gra2XBeHjxjcL6PJ X-Received: by 2002:a05:622a:1ba7:b0:35c:b9f1:e1eb with SMTP id bp39-20020a05622a1ba700b0035cb9f1e1ebmr21131075qtb.323.1663714712601; Tue, 20 Sep 2022 15:58:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663714712; cv=none; d=google.com; s=arc-20160816; b=OQAWYQd6MKQyj+KjoxwtfHz2qMvHa2SRxhBRJET3l6/qGtiA5HYuBccckjOFCq3v39 ZCKJHB8MLIPbfJq7q0hiKlRlHbDYS/gM9wVPK0/OqoDTExDafnDMNJ+hKwdnXWJykDgs aEXhf0bPElF8NsZLl2nVT8k8I3I+o1gf0Wvp5zWw2LExxcN4EEkalKMSLgVWdMMFDhJZ Y6Glydm6Ye5UTFM6RYsV/DuRJeYNz23UTqP6Ve6MZLYIs6chHHCeaU/jKIDZSY8bCAfv vLayMy/RG+oE4VXFBGJNZU+9pQQfCBrhWbRd0qv67Rod7zmBYPqbbBXQPK3WHn5xl//L JPRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iH6jIIlmVr3MkXQmYqy3OgPLmAu7CB0ASJoiLfWhauM=; b=ZfInpJZRsois/8uUCHMsO5+6BjdbtWoQ+HaOz8okZuiwiaH6aSHWDf9tw753tWA/I0 T3NN0DbgLXN0Lo50j5ggWVxwSV1nZGrdtzfutw2WKniKTZQGt1DE5l1v/UCAz1+6BSYE ZxXfI35krOb2v8VU52QrPgIrMulZ4UML2Bi8nWP/Uy2lyc+DGftpjt0hQ12gY3oglZFv sZxNukeZHoE8aOhn7/0o456HFrFlOfe3jE6/r2RT4IR/RWJwi3ML9HUufhzRygh4iny0 u6gBpWS+mTEu/lvelMy+RHB1GBBY3r1dLdS3UMf6RzXQu4jzrWWUgI/U7V6qFUh9F8hv CmyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rg5WwlRA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ea25-20020a05620a489900b006cdece7e4e3si577604qkb.457.2022.09.20.15.58.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:58:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Rg5WwlRA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oamCG-0007Gb-4V for patch@linaro.org; Tue, 20 Sep 2022 18:58:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oah96-0006AA-1Q for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:34:57 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:33692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oah93-0003b4-Qq for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:34:55 -0400 Received: by mail-ed1-x52c.google.com with SMTP id b35so5003019edf.0 for ; Tue, 20 Sep 2022 10:34:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=iH6jIIlmVr3MkXQmYqy3OgPLmAu7CB0ASJoiLfWhauM=; b=Rg5WwlRAL4ife1eiFjvW2tjpV5UtN5/jf+ObdPnbriW8EH3F7zoT4DC+rZhSM7Bt3k bQVCsw510+E7E27Ni56wMYKIOO4alpGVNcH2x+og8fPeUlMBxvXsVx0xXNWnnpD5CYZ9 V2joDiSIsT3nMNkzeDBpU3cWCan+0WZ16yRecf9ZLUQHmd/01V9Bf+LflAynTCVzrKJf 6wlpEORhztdxbg9m3JSn0qY7qelpMZRF2L3nsJqRLZv34IiGQA34hruYY963LLb1PLwT q2m4zP2bM/md/mUy2njkctGDn0jjfa3Xc7go0tjj3CyZdlplmYAsKqI7upyaMiOAyzyx rLpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=iH6jIIlmVr3MkXQmYqy3OgPLmAu7CB0ASJoiLfWhauM=; b=su8PxT5sBPvuZindBgj3Fv3Fz7x7xcMmdXbbuWt4B7wU75ZzK06jzrpkD+xRvUuPv1 joMB/SvDwu/In7fCUagd3vqVj6Jxrpgm1dZaC/jtgGPcS3UC4MCaAqPCun3V/he1nvBg P3t4UxDFIi5cw3nZuQWbkW3a5rQ4eWwGmHx0xOuE4GtGMJbkJkCGIZRo6mWUGal2xOjT JJ/qe7yrsfFwDP8Qb2+KOEI5qdeIGmCW6k6hG0e7tw35IcCMEP2Xp99kdBiekGzoS48i 3239avtDrzvyBhfnXJMLUzdFTBnG3bNESfk2YUHo7zg8PZ9JkE/0lrMVg1n9FZMQ6lpd X9qA== X-Gm-Message-State: ACrzQf3ObDTQ/ZkkQicxTD4BTDJ3hc9C/0aPtWYkGc775UD4xORdnz7I 7VLLewHcVWbci78dZv2J7hzppA== X-Received: by 2002:a05:6402:3904:b0:451:f01c:9217 with SMTP id fe4-20020a056402390400b00451f01c9217mr20787601edb.78.1663695292101; Tue, 20 Sep 2022 10:34:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j18-20020a50ed12000000b0044e7f40c48esm186474eds.62.2022.09.20.10.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:34:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 29D2A1FFC6; Tue, 20 Sep 2022 18:15:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 14/30] tests/docker: flatten debian-powerpc-test-cross Date: Tue, 20 Sep 2022 18:15:17 +0100 Message-Id: <20220920171533.1098094-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-15-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index db0ea15d0d..67bbf19a27 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -102,7 +102,6 @@ mipsel-debian-cross-container: powerpc-test-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian11-container'] variables: NAME: debian-powerpc-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8828b6b8fa..e034eca3af 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -137,7 +137,6 @@ docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 -docker-image-debian-powerpc-test-cross: docker-image-debian11 docker-image-debian-riscv64-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker index 36b336f709..d6b2909cc4 100644 --- a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker @@ -1,13 +1,15 @@ # # Docker powerpc/ppc64/ppc64le cross-compiler target # -# This docker target builds on the debian Bullseye base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian11 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-powerpc-linux-gnu \ libc6-dev-powerpc-cross \ gcc-10-powerpc64-linux-gnu \ From patchwork Tue Sep 20 17:15:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607649 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2046689pvb; Tue, 20 Sep 2022 15:00:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4MnPWFpnJVhxP53G495SFM6wzsqvFujZ7xIr3La1u9ewXPq3oO6OmbYvnqPb8G5MhxVH5c X-Received: by 2002:ad4:5d69:0:b0:4ad:6a63:b4a0 with SMTP id fn9-20020ad45d69000000b004ad6a63b4a0mr1290382qvb.122.1663711256332; Tue, 20 Sep 2022 15:00:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663711256; cv=none; d=google.com; s=arc-20160816; b=SCGp7vXtBJsR++p0Ln/fNO1Re3z8A4gJOLrAtlLEZ4ZMHLYYOtsBuLfMvZ6W2es/sD z0Aw2SZ+vFHx7TuzFN2PqGsp/76XEdai6ynOXEdOJQx2TyiKwyg/WS60Tzh3cLHrl1dZ 00PHBQIDyUtm/pJZxS6mOfViF6CrvSIbdX9sSxgYfPp3oIuq4xbIPRhWrdyFK2qHffp6 hCToa9WYzhK2pjue1DUY5qXbJvMJbuWzvxib7A4C711O9fVAiBDEafB/jomORc6LLXHF SwUon45JMEBcP2o/b4VyiDEHQyJ3Ml0uDKpRxuJNghhmyBMlj4OR8nr/VeBLNzRmc/ud syZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=86511PSfGdIpDAhzbaIAt+hVhHMNAndvtnlB7exVR9w=; b=qIvleQjucZG/nlt0ZGy4tkD7Byz7WZlHZPnSAcch6xBFOod47Vn2s/UM/hYa3R21WU mDgMNTasB9pJRuZSK1s0VBhItX8bKp27jU9RT2G5vt2S4gLI/vyiML31NRcQ+GVVd2rW vVVvhbgdP1BdkBWvPLq9DCcqfY8OfecfCmLw47HkP9XbBF/TaJaJQD4+TAqySjr6egVi hcWLyJPkrSUQOcvTilMsbrebKXBof/AQ1EBsn/BOgMrzdrihu9+x1ybD3MixE3MEmm8S /Bva76Njpv2W53U1BTZhB1g9eQ69mADyyhxo1ZnrFJMKNrXjlXNvfNYSw4ZWBqDuZ2JH zrnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FeXkXDhi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p27-20020a05620a15fb00b006ce800c8bcasi448858qkm.670.2022.09.20.15.00.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:00:56 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FeXkXDhi; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50034 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalIU-00015V-1r for patch@linaro.org; Tue, 20 Sep 2022 18:00:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzU-0005lQ-RL for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:00 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:46079) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzT-0001oJ-45 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:00 -0400 Received: by mail-ej1-x629.google.com with SMTP id dv25so7763641ejb.12 for ; Tue, 20 Sep 2022 10:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=86511PSfGdIpDAhzbaIAt+hVhHMNAndvtnlB7exVR9w=; b=FeXkXDhiHPneC5ptzqU6g2uP3EriIx+Z+e7Gn5cdYqWcHShvjN4WjjTVOh7hAigYD/ viW7NTh77rqSZB5G1J4hAHmYC2nIVCiHsUrv2W0f3cPIt0zNrLTIcg6Cx8/zbiUjSupb oxnHzTKUDwWONWO2NIqz+qVxxUIRSSgsNpvzwksKFsBv3hK9vPG1h+QDFKypqiE1Xdjx LbUyfvLeESqp5MPfvrLZQOTbZdCxhgDi0yPkV4+y1kx38zKrwVYDdZ7B/GlaOMiZ34r2 Z9EfV2hvvpttENusM7DnKhZ4jOM/VbbcHwzBTesbnZF8CuuPMBHPYu7kpfK79NbfujcJ bKgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=86511PSfGdIpDAhzbaIAt+hVhHMNAndvtnlB7exVR9w=; b=cokmBwA0ABVzftPBP80e13Z+WdeNI42LFNRXykpjKig8UZBYtDmTcf3m8bv7vQE6qT 7vZxjefGEpU62yAv2rELOA7VLIrttDIxygfaR/dd7PsjDzsu9RkUEFBH3IQJB17OXidz dIToAf3yDp4483tNAz6OE7uBfN5niL/CgMkk4Gxl1pJ3nhZ8cyRNxlYS98CAwPxExvbu 2xr/LwwRdF7EM6udhyF7h9rBoe6CV5uLTYH2xmGJwn6cIi3a6WInW788SEkYn1kzf1/L Hr5nJxC3goB9AxOyldVG9QEMPxhR5NOdwZZLkKlAnMUJo1g4yYmId3ND6g/EJulgSrtX s7Bw== X-Gm-Message-State: ACrzQf1ODzEslXgHbDpQSYPjrqJHYnTS27JvRoXmZntmH5iYEiA/ENDd 9aSMogWc8gqglkUeN+2StDZNAcSqDbVc7g== X-Received: by 2002:a17:907:7baa:b0:779:a71a:c8cf with SMTP id ne42-20020a1709077baa00b00779a71ac8cfmr17755188ejc.126.1663694697722; Tue, 20 Sep 2022 10:24:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b11-20020a170906194b00b0072ed9efc9dfsm190653eje.48.2022.09.20.10.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 426A81FFC7; Tue, 20 Sep 2022 18:15:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 15/30] tests/docker: remove tricore qemu/debian10 dependency Date: Tue, 20 Sep 2022 18:15:18 +0100 Message-Id: <20220920171533.1098094-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x629.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We missed removing this dependency when we flattened the build. Fixes: 39ce923732 (gitlab: enable a very minimal build with the tricore container) Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-16-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 67bbf19a27..611c6c0b39 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -148,7 +148,6 @@ sparc64-debian-cross-container: tricore-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e034eca3af..5c9398bbc9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -132,7 +132,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # Specialist build images, sometimes very limited tools -docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 From patchwork Tue Sep 20 17:15:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607654 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2052367pvb; Tue, 20 Sep 2022 15:14:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6C6OrEuQlhJrjWutETz3UM/Ya1q7T55hFVvB1PgDrU/G5Q8EuiDmmdKLrP1aS6/WIXku5N X-Received: by 2002:a37:40e:0:b0:6cb:be14:1818 with SMTP id 14-20020a37040e000000b006cbbe141818mr18042998qke.284.1663712041956; Tue, 20 Sep 2022 15:14:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663712041; cv=none; d=google.com; s=arc-20160816; b=c1I6nxxlCgrxdQ4vfMoygMrBx61RI6x8eFVOEeylBwCQ6z/7qUDNgutdfNiGIxxFCU 6+fdQPEfP8QVy4UnLSDr1ZOyOMb0un2KrwWPRH3CouYGJ1wSbg/Pxj5vNQ62pKw6zxM7 4WkniR+IhX8bA6akN4q97ErGHIJABxQZDK5e2wOLydTnnh7pKvG+AwR75/tFnB/6U3ay mNGaZSygMOcYhIbNQIs3qSVhRyapsbFO4uz93Im0piKOWb5yc1GGV/hgxHCbFWykTeUZ azXVmwNrDuBmiBvDvBwXCTGkznerAXx8tubgwQUElV3uArSibZDkfU2pOZ0GAW80755u hCAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8ZUKtzGk7WPnEFS3PMm7d4pu0BGAkLQhtgRChbWSZVU=; b=QQAXNnAgOguvGQzrlaGDhZUl597lhqUyR3zSSjufq14v4J3TSN9f560IzCfLJ/XAYF 1pcEt0VpCMYOMJmw0aQDZT1jUnrEkwh6f0YaXjNL3Ezdw5WhHozFoxKmK0QjlA8X2UXT /Vl0sgaWj3TCj8bor09ILnUoZx3pavYrA38W9a9FwMiMwmms9xr285uQ5j9hD2XkbSRm z5d8K1S/KiBHkbS6G1UOq5ci3zANyot10jqwtTaWCT7l0uPCWQ38FYxiWyJUeV/w/aKS RGchnqATGHcs8p5JGauuq5c/7jVqeIMaeYxjlk6FqNy6Wv6a08t3UACm+JeiVwXmOgtH RY+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S4JywhnZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y15-20020a05620a25cf00b006bc3067918fsi681917qko.58.2022.09.20.15.14.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:14:01 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S4JywhnZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalVB-0004Qp-Cd for patch@linaro.org; Tue, 20 Sep 2022 18:14:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzR-0005gD-9J for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:58 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:40657) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzO-0001nM-QA for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:57 -0400 Received: by mail-ej1-x631.google.com with SMTP id l14so7850445eja.7 for ; Tue, 20 Sep 2022 10:24:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=8ZUKtzGk7WPnEFS3PMm7d4pu0BGAkLQhtgRChbWSZVU=; b=S4JywhnZ9ig+hhir6jtm2ca+Bh83fPXqnvdjOwQ3P5+0OEn9RJqlrzZCNrotJmyaYm uQHCNSa+rbqXjXJOgdu6uzQ5Gb9L5wJEqEo1GKoo8RyY2QVSlp5VaLDafOCGF3ddYbQ/ hh16RQNfEaaYTpbX5g+Ud+j9Ea1S29nklQx/Oj7McX2LStLtPwVdQUooedw7mPI3WB0t t4Ae3B7ra2sbEM0mgL3+BvqshrPJ133QDQ7vjLd20b2G1k2YCeO6iAAcXZ9nw34Y302G Eq8tLsGr+WAi/6iNHxoVuK/hJmXxSgTUooYV44sGVxCKhBB9e31GU0kJP2UiCVaGlBKq /Row== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=8ZUKtzGk7WPnEFS3PMm7d4pu0BGAkLQhtgRChbWSZVU=; b=Jf4XZbcTlSKZyXnbFjBrgyIO4/NXHzhw1uNgx4rKQ0BWKR7HBJhwjL2qgq1wUobUNj jHY4ciEoXdEgjN0hdWDfYrUpRYtpsKqaYF/M/zrQS8vX7lES1gHTAYgs75nirD+KbnMP XO9YifrZAjiaMWVNEyXnZOIKnOxdphtqYJpdeljUScfdudM0+n6XLxALp4rIw7lYfe4N lyQpnK1TLykmv1eG06zMnb/t6gZaSnMz9P8mPXFbfoY2PkHKoLfdaTW2B2E4VN+3dYVJ XzOZg3IV6SbSiyhkysxZQrnHlrjFD39zgfxfqZ42NiJtkLVaOaW8+S38JsYg8ohmPAXF eWYA== X-Gm-Message-State: ACrzQf1GkjGWbP4YNOFWeH5adf6p1jp1IKHOOpMCmO5o5aKJHp33DMR3 1apU24RIz0Nm8nx3G4r7bHhkFA== X-Received: by 2002:a17:907:86ac:b0:780:df48:6a74 with SMTP id qa44-20020a17090786ac00b00780df486a74mr12903922ejc.656.1663694692909; Tue, 20 Sep 2022 10:24:52 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x16-20020aa7dad0000000b004548dfb895asm226586eds.34.2022.09.20.10.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 589AE1FFC8; Tue, 20 Sep 2022 18:15:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 16/30] tests/docker: remove amd64 qemu/debian10 dependency Date: Tue, 20 Sep 2022 18:15:19 +0100 Message-Id: <20220920171533.1098094-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; 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, 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We missed removing this dependency when we flattened the build. Fixes 9e19fd7d4a (tests/docker: update debian-amd64 with lcitool) Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-17-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 5c9398bbc9..c3375f89c5 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -73,7 +73,6 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES := debian10 debian11 ifeq ($(HOST_ARCH),x86_64) -docker-image-debian-amd64: docker-image-debian10 DOCKER_PARTIAL_IMAGES += debian-amd64-cross else docker-image-debian-amd64-cross: docker-image-debian10 From patchwork Tue Sep 20 17:15:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607637 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2041352pvb; Tue, 20 Sep 2022 14:44:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4iO8K5II1a8x/3enHRTMwkkLUsINNm6EDnddFQ+33hmEFMDVrXvCPFhQXx+i9tj5AfrgMi X-Received: by 2002:a05:6214:c87:b0:4ac:bc1b:d75b with SMTP id r7-20020a0562140c8700b004acbc1bd75bmr21248209qvr.110.1663710261915; Tue, 20 Sep 2022 14:44:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710261; cv=none; d=google.com; s=arc-20160816; b=DpVFiFg9UNfC21ql1Fc1zpBLVwujntZM8KhuT7VIH7/ks/H8pbowVTuINO2/7QX8/t z3u8ie8hk2qgNvwXCenyDm5ZSi2yIX8O69jMk83zN0v0NtYwdvB0ZWZgavZKyw+j3418 8Zsx9kh4KNdqR0KdexvK5IxO7Yg7UndV3iSbBEaTok+0pHwqwqJsofEI2tc0qEd1NT7Q mqivsj78Jj/Zgc/2EStpWaOIIoulmlo6cca1v8cyOECLgVEFVzjP+u+r6PqXw3nC378k FGjaci6UFgJQ6x6OMx/54lwmDfjh0XSlTyKsSUVoOIFRFdDv6kOlCldRI23c/SnVhTzR 3IaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jjWgH7l+7GgsF+R/Vmkn7IGDdCuZsyafwDXHCQ+NIKQ=; b=wt9ZB2e5w4LgJHkzRPHG2o8K2MM99wOelfXx+1JZ51hiB/e5txnfR8/8stcFgHGOUo SyLlVnGF11vwTIKBGNUYPMtHuuSARygD64AM41Nd8xcLyEGCxbat6rDNf9KUOkWkNjUu fKw1D22uk363niPhRqV1zgd1FwigmlwtjxewwQsEzNz430QmJ8YwieRxjkB8+Q1JOaal g63Bs06uBs+xt6MQsZbfn9dmKBXYJUxX1qlcRnIy3xTD0Psb3vdoWdAPD1aQbTJO9jhb BK5XbSrhuzwN+GswCYEKZrHXZp2LRpovCd33KYZrSMTY9mWwXSW0wqR8vRuNqMYhq+Tl lLHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LVyFo2Nh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gc15-20020a05622a59cf00b0031ee346e0c5si472481qtb.183.2022.09.20.14.44.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:44:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LVyFo2Nh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal2T-0001bH-Ac for patch@linaro.org; Tue, 20 Sep 2022 17:44:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqp-0000cy-0J for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:16:03 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:45945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqm-0000jQ-LX for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:16:02 -0400 Received: by mail-ej1-x62e.google.com with SMTP id dv25so7706268ejb.12 for ; Tue, 20 Sep 2022 10:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=jjWgH7l+7GgsF+R/Vmkn7IGDdCuZsyafwDXHCQ+NIKQ=; b=LVyFo2NhpH/Ry+nXdZXsiTYcj0vhtRbJ8qF7kGgpQKr1k5MEJDhwN0A+xlr+/A75FM Ayvh2Y3mEa3Sv7TU3EZXIUP73Chbp0Wb3+8tbtPW/cy5e19hlLq2unVu0+J4Wed8+Dki p3RW7kxn+qrZNAvffFoj/xk/kb725MqY2zX+7OuG3BUHUVtA2251RB5yevMkdPbCbnpJ 1pB2/jbRYwRltfKsZ9E4UO8cBWcV/ZpK0Kh/wGI9R+eQTFccuNIfgvQZTYn5qNX1lZs+ ByNMq2hUKYVG8xsxexTwSHwoEwtrX/T0neDWqZpEE9LaIG5ZLTMK/vS5l77AB5lnmXkG Jh+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=jjWgH7l+7GgsF+R/Vmkn7IGDdCuZsyafwDXHCQ+NIKQ=; b=rCpabQpgEDCXlpG1vF4N79Ykej9DW5rgkj4/OCI1utqx2ArBhCGrPAgpsm+RnSJJmz TsZJ3pqVotWxGhfP8iboDDJw+eOej6PzbhSwGECsd6/DdmAA7Dmga0s22wRDvHcuuqw9 N0kQkApElsCLKQSEJGcvcHTU0BqM3Sp6mcFz/TWs/DT61I6Ww4THWQJbe9LmmKGQpIYg fYQPUU5xR1IAbPBek7bVpIp5S8I61qLLEoMQvhzq7UgjwQ1oi4dDDQ4rkNqV1UajU8ku /dZfxe46z3lKCt9c8zwv9j0EOpAESKSKlSSOypK6cR4YX0+NjIV8S6SQPlHrsCcwRWF4 vIUA== X-Gm-Message-State: ACrzQf1x5hsfSgG7gdyOqi72ek7eEh0zhZL5wSYefdy/Bjg0tyuCSWaI OMWfrzcH4U8IkJO4YqP52/rqenLfrILnyw== X-Received: by 2002:a17:907:a0c7:b0:77c:d4ac:e8f1 with SMTP id hw7-20020a170907a0c700b0077cd4ace8f1mr17295600ejc.354.1663694158942; Tue, 20 Sep 2022 10:15:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id s18-20020a1709060c1200b00780f24b797dsm157381ejf.108.2022.09.20.10.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 72FE31FFC9; Tue, 20 Sep 2022 18:15:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Thomas Huth , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , =?utf-8?q?Philippe_Mathieu-Da?= =?utf-8?q?ud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 17/30] tests/vm: Remove obsolete Fedora VM test Date: Tue, 20 Sep 2022 18:15:20 +0100 Message-Id: <20220920171533.1098094-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth It's still based on Fedora 30 - which is not supported anymore by QEMU since years. Seems like nobody is using (and refreshing) this, and it's easier to test this via a container anyway, so let's remove this now. Signed-off-by: Thomas Huth Message-Id: <20220822175317.190551-1-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20220914155950.804707-18-alex.bennee@linaro.org> diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 8d2a164552..2cc2203d09 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -15,7 +15,7 @@ endif EFI_AARCH64 = $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) -X86_IMAGES := freebsd netbsd openbsd fedora haiku.x86_64 +X86_IMAGES := freebsd netbsd openbsd haiku.x86_64 ifneq ($(GENISOIMAGE),) X86_IMAGES += centos ifneq ($(EFI_AARCH64),) @@ -45,7 +45,6 @@ vm-help vm-test: @echo " vm-build-freebsd - Build QEMU in FreeBSD VM" @echo " vm-build-netbsd - Build QEMU in NetBSD VM" @echo " vm-build-openbsd - Build QEMU in OpenBSD VM" - @echo " vm-build-fedora - Build QEMU in Fedora VM" ifneq ($(GENISOIMAGE),) @echo " vm-build-centos - Build QEMU in CentOS VM, with Docker" ifneq ($(EFI_AARCH64),) diff --git a/tests/vm/fedora b/tests/vm/fedora deleted file mode 100755 index 12eca919a0..0000000000 --- a/tests/vm/fedora +++ /dev/null @@ -1,190 +0,0 @@ -#!/usr/bin/env python3 -# -# Fedora VM image -# -# Copyright 2019 Red Hat Inc. -# -# Authors: -# Gerd Hoffmann -# -# This code is licensed under the GPL version 2 or later. See -# the COPYING file in the top-level directory. -# - -import os -import re -import sys -import time -import socket -import subprocess -import basevm - -class FedoraVM(basevm.BaseVM): - name = "fedora" - arch = "x86_64" - - base = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/" - link = base + "Server/x86_64/iso/Fedora-Server-netinst-x86_64-30-1.2.iso" - repo = base + "Server/x86_64/os/" - full = base + "Everything/x86_64/os/" - csum = "5e4eac4566d8c572bfb3bcf54b7d6c82006ec3c6c882a2c9235c6d3494d7b100" - size = "20G" - pkgs = [ - # tools - 'git-core', - 'gcc', 'binutils', 'make', 'ninja-build', - - # perl - 'perl', - - # libs: usb - '"pkgconfig(libusb-1.0)"', - '"pkgconfig(libusbredirparser-0.5)"', - - # libs: crypto - '"pkgconfig(gnutls)"', - - # libs: ui - '"pkgconfig(sdl2)"', - '"pkgconfig(gtk+-3.0)"', - '"pkgconfig(ncursesw)"', - - # libs: audio - '"pkgconfig(libpulse)"', - '"pkgconfig(alsa)"', - - # libs: migration - '"pkgconfig(libzstd)"', -] - - BUILD_SCRIPT = """ - set -e; - rm -rf /home/qemu/qemu-test.* - cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); - mkdir src build; cd src; - tar -xf /dev/vdb; - cd ../build - ../src/configure --python=python3 {configure_opts}; - gmake --output-sync -j{jobs} {target} {verbose}; - """ - - def build_image(self, img): - self.print_step("Downloading install iso") - cimg = self._download_with_cache(self.link, sha256sum=self.csum) - img_tmp = img + ".tmp" - iso = img + ".install.iso" - - self.print_step("Preparing iso and disk image") - subprocess.check_call(["cp", "-f", cimg, iso]) - self.exec_qemu_img("create", "-f", "qcow2", img_tmp, self.size) - self.print_step("Booting installer") - self.boot(img_tmp, extra_args = [ - "-machine", "graphics=off", - "-device", "VGA", - "-cdrom", iso - ]) - self.console_init(300) - self.console_wait("installation process.") - time.sleep(0.3) - self.console_send("\t") - time.sleep(0.3) - self.console_send(" console=ttyS0") - proxy = os.environ.get("http_proxy") - if not proxy is None: - self.console_send(" proxy=%s" % proxy) - self.console_send(" inst.proxy=%s" % proxy) - self.console_send(" inst.repo=%s" % self.repo) - self.console_send("\n") - - self.console_wait_send("2) Use text mode", "2\n") - - self.console_wait_send("5) [!] Installation Dest", "5\n") - self.console_wait_send("1) [x]", "c\n") - self.console_wait_send("2) [ ] Use All Space", "2\n") - self.console_wait_send("2) [x] Use All Space", "c\n") - self.console_wait_send("1) [ ] Standard Part", "1\n") - self.console_wait_send("1) [x] Standard Part", "c\n") - - self.console_wait_send("7) [!] Root password", "7\n") - self.console_wait("Password:") - self.console_send("%s\n" % self._config["root_pass"]) - self.console_wait("Password (confirm):") - self.console_send("%s\n" % self._config["root_pass"]) - - self.console_wait_send("8) [ ] User creation", "8\n") - self.console_wait_send("1) [ ] Create user", "1\n") - self.console_wait_send("3) User name", "3\n") - self.console_wait_send("ENTER:", "%s\n" % self._config["guest_user"]) - self.console_wait_send("4) [ ] Use password", "4\n") - self.console_wait_send("5) Password", "5\n") - self.console_wait("Password:") - self.console_send("%s\n" % self._config["guest_pass"]) - self.console_wait("Password (confirm):") - self.console_send("%s\n" % self._config["guest_pass"]) - self.console_wait_send("7) Groups", "c\n") - - while True: - good = self.console_wait("3) [x] Installation", - "3) [!] Installation") - self.console_send("r\n") - if good: - break - time.sleep(10) - - while True: - good = self.console_wait("4) [x] Software", - "4) [!] Software") - self.console_send("r\n") - if good: - break - time.sleep(10) - self.console_send("r\n" % self._config["guest_pass"]) - - self.console_wait_send("'b' to begin install", "b\n") - - self.print_step("Installation started now, this will take a while") - - self.console_wait_send("Installation complete", "\n") - self.print_step("Installation finished, rebooting") - - # setup qemu user - prompt = " ~]$" - self.console_ssh_init(prompt, self._config["guest_user"], - self._config["guest_pass"]) - self.console_wait_send(prompt, "exit\n") - - # setup root user - prompt = " ~]#" - self.console_ssh_init(prompt, "root", self._config["root_pass"]) - self.console_sshd_config(prompt) - - # setup virtio-blk #1 (tarfile) - self.console_wait(prompt) - self.console_send("echo 'KERNEL==\"vdb\" MODE=\"666\"' >> %s\n" % - "/etc/udev/rules.d/99-qemu.rules") - - self.print_step("Configuration finished, rebooting") - self.console_wait_send(prompt, "reboot\n") - self.console_wait("login:") - self.wait_ssh() - - self.print_step("Installing packages") - self.ssh_root_check("rm -vf /etc/yum.repos.d/fedora*.repo\n") - self.ssh_root_check("echo '[fedora]' >> /etc/yum.repos.d/qemu.repo\n") - self.ssh_root_check("echo 'baseurl=%s' >> /etc/yum.repos.d/qemu.repo\n" % self.full) - self.ssh_root_check("echo 'gpgcheck=0' >> /etc/yum.repos.d/qemu.repo\n") - self.ssh_root_check("dnf install -y %s\n" % " ".join(self.pkgs)) - - # shutdown - self.ssh_root(self.poweroff) - self.console_wait("sleep state S5") - self.wait() - - if os.path.exists(img): - os.remove(img) - os.rename(img_tmp, img) - os.remove(iso) - self.print_step("All done") - -if __name__ == "__main__": - sys.exit(basevm.main(FedoraVM)) From patchwork Tue Sep 20 17:15:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607655 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2053432pvb; Tue, 20 Sep 2022 15:16:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM45+GYBfIm0RhMUGF8xKRXLAefkdjOO+kMuouQjqBCTBfTzZHXZXDi3Zb8/EzP1kTERFVpZ X-Received: by 2002:ac8:7d90:0:b0:35b:afd3:20aa with SMTP id c16-20020ac87d90000000b0035bafd320aamr20791851qtd.252.1663712196374; Tue, 20 Sep 2022 15:16:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663712196; cv=none; d=google.com; s=arc-20160816; b=QnrzUdF74sDAMm0tqF+9DFtCw5tu451gVu/Jg+8fwQ8yR5eB4jB79rI477FaUx7hwd gBfQOlY36yQZTYgSQXVHY/KuLRFwoFCcKS4bqWMg2RJAJWptgXf9rvzyKZPMeh4rtaA+ +VeLCNmHgayaIWwQBcv+LhK3O5aoHBLKu6rIA27qCL2ZhKLZsLJo4rudNYURHBHCgGZO GZUodok6FBmwyi/9kVprsC+jHEsAXMAEsMyzauUnXqmI+Rv4xQAq7EyBKTzvERfCO9up VyibapbRXjotnX55/LazJTzPt+B0RrKrLCuhcXKcEsAUbAD5uXOMHr+3x1cLYpd5DKOu 1wYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=SwsloABj9l4c1j5XqayskjiIM16mHr6hEPOnkBWi5uQ=; b=pfh8xj+4ko+VHTsK5skxrVyXM7c2vOqXIHAFSfOBXeMdIFhGKbpIWddmxHryIpuOH2 Ez5MwTZp3t+ZGd0FnjbqntLuNIdtlS7C8JS7dqejexEVy8eR+b7MAywcV4RXi/Z1fjsT hLIkpZx3G7auOgC+5uopOokCDVBNUgpvHdC3xzNLtl6HUEPphXrK3+BRK+8Dir+CVSbc 9efZqC0rt5za7AlOsefqpeY3Xg08o0RBYRqmTRk+Hk2zBKS4EbIkOUhhmN714fdRGoZp 8fdmCUADEEE057EfQsPibqR+atC0qQs7OE+PfyzODce3vIhU9Wo4n3v2CYrJodi1oXLs fNiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XHZ9edWe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o1-20020a05622a008100b00342f80228c1si544574qtw.145.2022.09.20.15.16.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:16:36 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XHZ9edWe; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:57136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalXf-0007pD-SZ for patch@linaro.org; Tue, 20 Sep 2022 18:16:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51392) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzf-00067U-L7 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:11 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:42968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagze-0001pC-3G for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:11 -0400 Received: by mail-ej1-x630.google.com with SMTP id sb3so7822486ejb.9 for ; Tue, 20 Sep 2022 10:25:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=SwsloABj9l4c1j5XqayskjiIM16mHr6hEPOnkBWi5uQ=; b=XHZ9edWefWpq/w+E3WTfaeN+tmWMenqZFrL3a6ZIGuVLG5lwa/pAHE7zsrBPfAQbzQ +QR9FahwkOEMEijozVnlce2nJuK2K07CwrAjoDZCGNzcKO5eVEOpophGy039zWrcXc8+ uLVjVTN+Ko/3xpw0AYDUgvOmhP5FZfdmXjmh6kvInAo9HzluI7at4y7WDKvvzbliyGlx 9bCmurYpNusiWHn+5Jb2xX8lHYJHL+/wn1whHeCVyULcplEyWFiumSRR9gO3EHFc9iKV g1Xkmm/U3e7dnSrE9R/k8pAXM5mmNJtyfrDyU/5cuuhGQwHniXWFww/+NCXAxh4jP9rA m3zQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=SwsloABj9l4c1j5XqayskjiIM16mHr6hEPOnkBWi5uQ=; b=odXc70l06MadiHgSck9yJ9UBIrzZ/wwg4kLA4MqYd0QlMdJzp9QAC84s1b5WvnACnc o5v+qUQYYd4VcooFp6lRJQ32IjFFjH5FUAfwScRGmsg7eOtx51F8y3ORSzLePJhuUyQ4 yh04M9srSJ9t4uuW2enPd3O71soK3GHiqhrZ7ssT/G7wgUVHi5lLn3zkE0IWk7KaPavN z8E2IJ8Sf6ZRGRa/tnBKLiZOC4w8AyRPE4YMPis30c4TiHRfKRHA6eXoHPGT4zTrC8cP Mx4j4ABqwupmSsLv8sVDUn210rrNl4F4867d6b6d57/8pi12Q1xkdFrg1czWRrxyCCpR pPNw== X-Gm-Message-State: ACrzQf0guwDD0z4zD1kF/bAjHjvKq8Rz84fvH9VqL7xWudxxe/yAYPKn oJWfsxVxh2MTNlDMcKaeAlo3k0swj7yk1A== X-Received: by 2002:a17:907:1c03:b0:77b:9d77:c5 with SMTP id nc3-20020a1709071c0300b0077b9d7700c5mr17510887ejc.225.1663694709314; Tue, 20 Sep 2022 10:25:09 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b12-20020a170906d10c00b0076f99055520sm146043ejz.137.2022.09.20.10.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:25:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 88AAB1FFCA; Tue, 20 Sep 2022 18:15:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Paolo Bonzini , Richard Henderson Subject: [PULL 18/30] configure: explicitly set cflags for --disable-pie Date: Tue, 20 Sep 2022 18:15:21 +0100 Message-Id: <20220920171533.1098094-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is working around current limitation of Meson's handling of --disable-pie. Signed-off-by: Alex Bennée Cc: Paolo Bonzini Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-19-alex.bennee@linaro.org> diff --git a/configure b/configure index 575dde1c1f..0bbf9d28af 100755 --- a/configure +++ b/configure @@ -1382,6 +1382,9 @@ elif test "$pie" = "no"; then if compile_prog "-Werror -fno-pie" "-no-pie"; then CONFIGURE_CFLAGS="-fno-pie $CONFIGURE_CFLAGS" CONFIGURE_LDFLAGS="-no-pie $CONFIGURE_LDFLAGS" + # Meson currently only handles pie as a boolean for now so if we have + # explicitly disabled PIE we need to extend our cflags because it wont. + QEMU_CFLAGS="-fno-pie -no-pie $QEMU_CFLAGS" fi elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then CONFIGURE_CFLAGS="-fPIE -DPIE $CONFIGURE_CFLAGS" From patchwork Tue Sep 20 17:15:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607652 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2049883pvb; Tue, 20 Sep 2022 15:07:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM41+9eMTlPP7+5CEsAVbm5QpC9iGZvtm2jPATZlyVO1TIe/59PeytQCg2CczOQ5E2lFsgkf X-Received: by 2002:a37:48c:0:b0:6ce:121f:a69a with SMTP id 134-20020a37048c000000b006ce121fa69amr17912667qke.13.1663711657603; Tue, 20 Sep 2022 15:07:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663711657; cv=none; d=google.com; s=arc-20160816; b=c1h00BYJH6KI6GdbcgVFyj/rnYqSCIqsDpeWKeNPb8dRILDgR5CH+UQ2NAfzGPn0ib PCRKwxp6lslHTvYoWTRZ7MxZ3svKCPF38+J/nfWNz9O0134r4mvOFgWhdy1rz6Pz4l7X kYqUu0TVObaqa2pNw0bNQ4PPx1hNptLsbS40VPk2aOmOs0k54rKUPMAIC+MIne3dzijQ 8DwhBqveC0gTsH0l1XUYWqWz/Cux4uKF1tE9Am040QmcEXbKDgOzIimAhqpsAYZXaKrh 3XEkoCM1UjjiiH17/TVhgSLBYcsv3U/y88XQdmAzdMjm/sWG7qh+2n278wc7jElVyWp2 i38Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=N5I2F6uV15K8rJ+JfIBb+LUKr5djlIcn2XXO4PUTzSQ=; b=kjBWNSL7sTRLjEZmrpJRzeApEI1yor2xchrX5ZqO2c7rraCELSRJkekLKECIEQxlcg Jk3qyT90GtMY1tX1G8hjAXKseiOYueBPq6bB5ysp5canaupMgpIkK1lWgp4iCVGhVdQw MM2yTVgBMKo6qAF1BFMax+tssRfr0EKLEV7/NqvcOb8xROcyoYW5Ieo3+PcgiYNGyUL4 SV1R8ipOQ5u3Nlb9ll3S5gFDLrE9IwM6a/zoVy8dSNjtcqjmrD+4DdysjDLqQ8kEtDzL BzPlJw6IaqCB/TpImu5XYnkdNBy1JKS2y0oIxkjEq7CWp5EGAN0d9vWQ8GdChNC/F5Iq aktg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kDNettcX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i7-20020a05622a08c700b0035c2bea5448si564094qte.229.2022.09.20.15.07.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:07:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kDNettcX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalOy-0000X8-VY for patch@linaro.org; Tue, 20 Sep 2022 18:07:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagqt-0000ho-3N for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:16:12 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:34367) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagqr-0000k5-8t for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:16:06 -0400 Received: by mail-ej1-x62e.google.com with SMTP id y3so7863769ejc.1 for ; Tue, 20 Sep 2022 10:16:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=N5I2F6uV15K8rJ+JfIBb+LUKr5djlIcn2XXO4PUTzSQ=; b=kDNettcXcvfqL7fbnmOFmKmC8sk92FCfF2RE7rYPRqi8xu30qiMlo752lSCfwiNzTy 087UWbizDmilUcdkzHjaG1nsvuS8JpJKlppwNLHo+mv3s35LhTd1tKLqYqJ/dvPizfdJ 6quu7Zfpd7/uxc6zMJDCzyIAEOWM3cR2Oqhwk8l6jDC2mgp4wJbtUDOLNNF9rHuMEFVj +XTZzLfPDcL8CmzMjf+8psVACOu8i123i5fzmSIuPuwSJHMorx6Ighpt599q5wvX6HVZ B+FVXVEaaT7kGXn3hkV2ZzGF5CF31ZCJLhUGIZKqZamrcNmeu2Mb/t0GIVwkuBn2vvvz 7xOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=N5I2F6uV15K8rJ+JfIBb+LUKr5djlIcn2XXO4PUTzSQ=; b=l9qLtKWr71DK8TUSUGWN3iRxkLBlUqO5oAQYfRpaGW5LRa26s5RYsCQu5ZPa/4VDOg 0zzlzMn8hHLbVjakDWe3mC/U5uN3xrRb4oiwiCx0RJhxkoSDOCu9YElWjvnf4zA1rjs+ Uo6XXloh5LV1r/3g86nbMHiyloYw8kSnbjMv9HYm9qVIYuhqTwfqRONh0zXVugHD9c8B xVgUmpqVKeGWe21EhJmkFS40pi7nx7si+LzaGP5wTv2Ve3Psb04SCMixNMqLuefm/xVD F8ZAGBCkd3hfRdd8CRPjKKHho4khOgo5JTjMDK0A70hSFGljB3j6I93QxxMu2LL0r0mp RbjQ== X-Gm-Message-State: ACrzQf2JgaEXe082KO1sk191rGQ2uqfTPxDd+ia73xMnC6XDZIDbH0NF L5TiAmvfx4eedebMhA4numazCQ== X-Received: by 2002:a17:907:3f87:b0:781:ee94:7f91 with SMTP id hr7-20020a1709073f8700b00781ee947f91mr1122904ejc.52.1663694161325; Tue, 20 Sep 2022 10:16:01 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d13-20020a17090648cd00b00770880dfc4fsm200665ejt.29.2022.09.20.10.15.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:15:55 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A08811FFBA; Tue, 20 Sep 2022 18:15:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 19/30] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64 Date: Tue, 20 Sep 2022 18:15:22 +0100 Message-Id: <20220920171533.1098094-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62e.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The project has reached the magic size at which we see /usr/aarch64-linux-gnu/lib/libc.a(init-first.o): in function `__libc_init_first': (.text+0x10): relocation truncated to fit: R_AARCH64_LD64_GOTPAGE_LO15 against \ symbol `__environ' defined in .bss section in /usr/aarch64-linux-gnu/lib/libc.a(environ.o) /usr/bin/ld: (.text+0x10): warning: too many GOT entries for -fpic, please recompile with -fPIC The bug has been reported upstream, but in the meantime there is nothing we can do except build a non-pie executable. Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20220823210329.1969895-1-richard.henderson@linaro.org> Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-20-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml index 3d878914e7..3f4dee4f86 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml @@ -16,7 +16,9 @@ ubuntu-20.04-aarch64-all-linux-static: # --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages - mkdir build - cd build - - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh + # Disable -static-pie due to build error with system libc: + # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 + - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh --disable-pie || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 From patchwork Tue Sep 20 17:15:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607657 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2055348pvb; Tue, 20 Sep 2022 15:22:28 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7prQunNY0N4or/lx2vJaCBZYvshNrZeadwoJ+jPqiU0l6mAgXFoi9lS0U5ZHhEXYAjxCkR X-Received: by 2002:a05:620a:15d4:b0:6ce:1bfc:1d51 with SMTP id o20-20020a05620a15d400b006ce1bfc1d51mr18276915qkm.562.1663712548390; Tue, 20 Sep 2022 15:22:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663712548; cv=none; d=google.com; s=arc-20160816; b=cHWS6fsx87rIobaCh7V6IqCvOSmTjIoOjtZgekCGkbbF38jjeWytHtPh6BFbkUkQOQ 8IGbxRV1ZFHh03wo79+QACbixkHDuplWnXg+mU6jUGGBskoojK3ETxTZYg0M1j/C3oWG hEAHYpfXhZGfZtofEI5g8zFc4Kr/QzBTL6k4w3nIk72nBfRKs4gOGLJWszJrV7r6OYKC kw19Y9zedUb+K7GrQNYOqW46kI6V4d1/TqTlzAq5h5K5nmogA3U32Z+n5QniHmT4HsVh 4bzQvxJ3yT6G3RKTjMXyb5wMNbyOq5+JBG8UCHJ0MV2s2KBh2GEepsX6ua53MB8nGAx+ +UkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3o2V5qY3va6oi4DyilHks2k3IlXaipM0Pd6rZp5g9VI=; b=CuGgDrabWwz8Qz7Tkk/1eyzuDBHbPtaf1u3VnHbBAUUjL/M/b/a+jSolUBkzhC8M8k i9Wwog17cwGlGRpriWAvNFmIlvs2AsOv6XfnIo/yYUeVjbPNXgMdsR6LptEGT+PnmxTo xZ4Ryv5Cxjjb/Bo5TzH0om68llt/xy8rn7Yeq/OWV9/X0KFpfiLQRZlj+Y14gaG/1UEe YLgQc0eEM+cAwFcOeGMapC+2z2wGpNqWS89FffK5cSUBW8qLIZGNSgdK5ltEzIovHGqZ dxzTeqvmMGZoUEmhUhSyy+qDvgFzOc2hWykWrQKTO4pzDClC4xIv0dPvlOVf17pFWk0p zpgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YQJG+rBp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gw1-20020a0562140f0100b004ad6b307840si433857qvb.22.2022.09.20.15.22.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:22:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YQJG+rBp; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:52486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaldL-0000Up-Rt for patch@linaro.org; Tue, 20 Sep 2022 18:22:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54364) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzY-0005uK-FT for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:04 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:42968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzW-0001pC-DF for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:04 -0400 Received: by mail-ej1-x630.google.com with SMTP id sb3so7821612ejb.9 for ; Tue, 20 Sep 2022 10:25:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=3o2V5qY3va6oi4DyilHks2k3IlXaipM0Pd6rZp5g9VI=; b=YQJG+rBphFdJCXfNXYp9mcOEYXawJ2q71kwTopRUYoXoH9GPnA2DAjFNUkMJdZQrVM BTvK8Z+qxSdlXufOAWRTcou7phTZlqI8IcTIEo2aNgsrRdlnUr2yxWE3akcAiB9MbeyZ 2Cz4VUbtwaM7QgZ/qW4TTo0kKH1LKRSrk5auvSznf3VsFXVO+rHBXLhGNkk0f/wKfDBU gJLXkS9YqYuXaVFqhyXz8wiRUYp1pqIV/Bdhdnz5l1UQJmOcda9H7rceMdcA/5fwyVwf Pgjx4pyKYMlAooKAObN+e1s06lJd6hMJSB6COAaPtjYwL9QZfNqbpK6csy4Rub5ayPp4 8BUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=3o2V5qY3va6oi4DyilHks2k3IlXaipM0Pd6rZp5g9VI=; b=pI2xFdWwCAhnFXiTR4vcVe2t7RgvYvDolyo5E88ZgDtYYVMhCPWvuCnnRwb8jIFsna cLxrKjWg/t7VxwA0XsR473akgCcLnH2x1lENjHaHPl0h5Mi44RqsVwdLMGdnNsNfS77o fREW4TcsslFUxs7BeWQ5cbxm1jJMa/b/u7bpb/ZH9ZIouNdUEC09XEug1pcWQ+2w0/ba WQlz9LUJch9sUILGWGACXkLx3FbdLwDjWYwEtlFJuBVtvEHN2YnBceFbQZT9wWQSSBkR /QpAw1lmodyDAlg80xVxmWxMBU7gbfgDd4JrZlm/x/Td9bJELLDcmTtJsGY6DRgOzpGp iMXg== X-Gm-Message-State: ACrzQf3CjwuRDmWzfhve5bCutnZs2oZ9K/o86sepDmqr/sqU9R0U7R7o Gi+Z0+VLjXD2GCepBJKXGl4KqA== X-Received: by 2002:a17:906:b106:b0:780:83a8:773 with SMTP id u6-20020a170906b10600b0078083a80773mr17596317ejy.758.1663694700731; Tue, 20 Sep 2022 10:25:00 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o10-20020a170906768a00b00781e7d364ebsm145286ejm.144.2022.09.20.10.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C09121FFCB; Tue, 20 Sep 2022 18:15:35 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs Date: Tue, 20 Sep 2022 18:15:23 +0100 Message-Id: <20220920171533.1098094-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The custom runner is now using 22.04 so we can drop our hacks to deal with broken libssh and glusterfs. The provisioning scripts will be updated in a separate commit. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-21-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 15aaccc481..97f99e29c2 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -15,6 +15,6 @@ variables: include: - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' - - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml' - - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml' - local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml similarity index 86% rename from .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml rename to .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml index cbfa9cc164..1a2f9b8dbe 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -1,12 +1,12 @@ -# All ubuntu-20.04 jobs should run successfully in an environment +# All ubuntu-22.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/qemu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 20.04" -ubuntu-20.04-aarch32-all: +ubuntu-22.04-aarch32-all: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch32 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml similarity index 82% rename from .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml rename to .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml index 3f4dee4f86..ce0b18af6f 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -2,23 +2,21 @@ # setup by the scripts/ci/setup/qemu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 20.04" -ubuntu-20.04-aarch64-all-linux-static: +ubuntu-22.04-aarch64-all-linux-static: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: "$AARCH64_RUNNER_AVAILABLE" script: - # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763 - # --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages - mkdir build - cd build # Disable -static-pie due to build error with system libc: # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 - - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh --disable-pie + - ../configure --enable-debug --static --disable-system --disable-pie || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 @@ -26,11 +24,11 @@ ubuntu-20.04-aarch64-all-linux-static: - make --output-sync -j`nproc --ignore=40` check-tcg V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-aarch64-all: +ubuntu-22.04-aarch64-all: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -42,17 +40,17 @@ ubuntu-20.04-aarch64-all: script: - mkdir build - cd build - - ../configure --disable-libssh + - ../configure || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-aarch64-alldbg: +ubuntu-22.04-aarch64-alldbg: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -60,18 +58,18 @@ ubuntu-20.04-aarch64-alldbg: script: - mkdir build - cd build - - ../configure --enable-debug --disable-libssh + - ../configure --enable-debug || { cat config.log meson-logs/meson-log.txt; exit 1; } - make clean - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-aarch64-clang: +ubuntu-22.04-aarch64-clang: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -89,11 +87,11 @@ ubuntu-20.04-aarch64-clang: - make --output-sync -j`nproc --ignore=40` check V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-aarch64-tci: +ubuntu-22.04-aarch64-tci: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -105,15 +103,15 @@ ubuntu-20.04-aarch64-tci: script: - mkdir build - cd build - - ../configure --disable-libssh --enable-tcg-interpreter + - ../configure --enable-tcg-interpreter || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` -ubuntu-20.04-aarch64-notcg: +ubuntu-22.04-aarch64-notcg: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -125,7 +123,7 @@ ubuntu-20.04-aarch64-notcg: script: - mkdir build - cd build - - ../configure --disable-libssh --disable-tcg + - ../configure --disable-tcg || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 diff --git a/MAINTAINERS b/MAINTAINERS index 1729c0901c..738c4eb647 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3724,7 +3724,8 @@ GitLab custom runner (Works On Arm Sponsored) M: Alex Bennée M: Philippe Mathieu-Daudé S: Maintained -F: .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +F: .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +F: .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml Documentation ------------- From patchwork Tue Sep 20 17:15:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607633 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2032305pvb; Tue, 20 Sep 2022 14:19:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5hJqHOq+ipJ/aTJnMYUjWYcjbgtW9Ge0qOwrqVoSpFWCeq4ugmMvRoK2e+wueZt35cFyhr X-Received: by 2002:a0c:f388:0:b0:4ac:ae7e:b70c with SMTP id i8-20020a0cf388000000b004acae7eb70cmr20674700qvk.43.1663708783374; Tue, 20 Sep 2022 14:19:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663708783; cv=none; d=google.com; s=arc-20160816; b=oButg6XVXrE59j92g3m739U9KiAc+m0QTLQYT2jy3+5690gj3nvfoY0kgwN/I5qUow mS3qoPouZtLUTzyZuGAqYYo6915oI/ta/UsDhH3+1rKMo/lO1HBzRsHYvyWOIb97jyed pQmIcblcwYPu3TJXH/ckrh/lmg3YDdRYGRauCe9ufCT+KKOwlh43ooXz6zcujtvx5vLE B1/GEe3UvrYUKOTFWl7hfnSaXZ1zRoYxyoosPnlnNmgsqHUF1UL2w4QC3ZZJegaSKJrt qzC1ytC1wsMTD3PljDz6pBwYjx22Sn3fxl3tfv1RbjU4zkKeFOMiwEAcpVKEjVNwKlVE 8Fqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EyXiClvBgcxNkia9TfTVEvuirS+K1EwYfQ6G+A3OABc=; b=L9OiwOqPFcWHo/3l8WXqoPzqVQpPpp2P0+Z6khMo8xFUU382Gm7+Yq/5g04P+C2MeA 3iBM2fHxSgymjHVdiVEoOmsis1+9ujVbvmjAPOZmUw2F+LIsHo0+1AdtxHBX5UJCpuQo BgSzeFC8GNeTK8TdzQY0klfJrFRPdhfLzClYhQMkOwWX7QpiYPjjzCEVoC4IsCmtsnXp OB/DhlTbXIw43YjRmJsCOfbCrEmVKtUTuG9S2haeTg3dhnrzGC0yAaG7ciXhKhXRM2VV jHQRCk+KjDTrczmJgybZdzCcWt6CC+CD623yaIUiMUWEDVwcxRNr/Nr+k2lk/Y1Bihqn zYPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YJjuOWwD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id im7-20020a056214246700b004aaa72ac30fsi570931qvb.2.2022.09.20.14.19.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:19:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YJjuOWwD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakec-0007xM-UY for patch@linaro.org; Tue, 20 Sep 2022 17:19:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzS-0005gu-Ik for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:58 -0400 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]:37610) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzQ-0001nm-Mq for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:58 -0400 Received: by mail-ed1-x52b.google.com with SMTP id a41so4899330edf.4 for ; Tue, 20 Sep 2022 10:24:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=EyXiClvBgcxNkia9TfTVEvuirS+K1EwYfQ6G+A3OABc=; b=YJjuOWwDDQ6k7QRAuuRG1uB69ZEGzgZe9RATwp/soqaGfZ5Rv63XmF0hv1cnlpdoNZ QdLiFJf9OUQSuqxku6wSb8T31hOy14dtWdYhM3df2dZqyi224zmpmSpqEEFTZAOBUsd9 AnLA5bcMaAv8zBuIrsygd+8dckSMMg7C6Of2sVw3z1LTqIK89z/TPL/B21nAmM/ty7TF UbH2dY/+jQMhGaEM6Qx+INNzy/sog/xy3qKFFu6SzwY9PGdFOVEuYOFFQ2y/7ihJPq06 tIh2FcgxWLMkr4po1k52CMq/Pk5ZnVM/kYZ6La3kDw2uiMIqMKQlge2vYqgl6NWZVp23 KbWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=EyXiClvBgcxNkia9TfTVEvuirS+K1EwYfQ6G+A3OABc=; b=RJ5zJNlUSbLUhggLqbdsxyKeBEhHcJ9aT5moSC8sCo8jRXtiP4NSzblitbHzKN3N8K ps2j0H5tpA2r2nOAJLBzSIDdHHYJ76VqTmfgykcmE2BkKlUbDCwy/nnPiwqFTSmtZlBu xe+eoMvSIrwCXEN9t8+RjLYnZB6U/HMD2bkjOXlUhJuBm2PnRTVH2q98B4KcNfhimhKL wR8ZztPvMmUxYa3JcG117Psok2ksdz4Bq3lXMwznd8qFzo/gBKZtzWWQkk6U0vg+N+J8 cT9/rBzP7cFqQsH/EGczXDA91fo3jX4r3VlXrgA5NNy98bFanUCQvJLNk4PpKU6r/Zto AxaQ== X-Gm-Message-State: ACrzQf07zE/Y2VErJ5ioscfLNI35/cemy3CaE03o6X/xCu5JGvFXjZl8 13x/MLdhkFD1c6IlyfLYJVDV8w== X-Received: by 2002:a05:6402:3213:b0:453:4426:a97b with SMTP id g19-20020a056402321300b004534426a97bmr19988612eda.8.1663694694801; Tue, 20 Sep 2022 10:24:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d5-20020aa7c1c5000000b004518ee90b4dsm239332edp.1.2022.09.20.10.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0E1C41FFCD; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 22/30] tests/docker: flatten debian-riscv64-test-cross Date: Tue, 20 Sep 2022 18:15:25 +0100 Message-Id: <20220920171533.1098094-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52b; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52b.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Flatten into a single dockerfile and update to match the rest of the test cross compile dockerfiles. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-23-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 95d57e1c5d..3a8bd75473 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -122,7 +122,6 @@ riscv64-debian-cross-container: riscv64-debian-test-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian11-container'] variables: NAME: debian-riscv64-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b1bf56434f..24cd44e667 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -133,7 +133,6 @@ docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 -docker-image-debian-riscv64-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker index 1d90901298..e5f83a5aeb 100644 --- a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker @@ -3,10 +3,12 @@ # # This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian11 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-riscv64-linux-gnu \ libc6-dev-riscv64-cross From patchwork Tue Sep 20 17:15:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607659 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2059311pvb; Tue, 20 Sep 2022 15:33:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4hXNKQ+xZgqjzeShvejhIQ+UI5wr5ypXVj3AMyT4omfWGPaVWylStNuyPLY3P973VlLlB5 X-Received: by 2002:a05:622a:1316:b0:35b:b629:5247 with SMTP id v22-20020a05622a131600b0035bb6295247mr21571685qtk.275.1663713237758; Tue, 20 Sep 2022 15:33:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663713237; cv=none; d=google.com; s=arc-20160816; b=eLH2Oi7gs0i9Tu/XvXQTsds7vv1tCqUceFVpjktQpGo2AFH7y9y3F8YhJ68mjbp76E ASLUrrrb6mlDAFiSzCCrPzpHQS5PjVr7/onu8PZQLxbFQQEDcYyf9KcmEDa/1vfdvWpZ pocxGEkforKkN/rRMzMTEPNHA2X73e15c2ZOFeG75kuSMT8gzMEgfguOGpctTW94yTD3 gyo31d6C6kDIkXhzljcIHbCQE73vpFlpbgJFANgR/bg4dLjeelPkDzwJqP2pnN823zHm RC4AlW60UgEl+85TMilHtu6Bj3JiJsw1FJtuHd/lEvS/3RBPdi1Y+M+W611OOkYO8uOx RsLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+HHAGmPTEVaK8BLouLq5FfiutB4A/NBtflNNRIi+YP0=; b=thg/3/N7GEV0zXl8uZOcWubAj3srAZ3EFB2uVrwrv8rq0rwTBcP5MpaYk2lK+mCDKU Wi0qalW+j3R7FJIpGWIKWZFED0b6IcWS9O/dhWg9mUN5Tqkp1VeR4+d0hFu8/KLyNccH Eji5q1sTj+ZOFu3r27Hzi1Y4H2rG8U8b2b/ljIG/3pi1aJ6/MiS8SYvRJlS2//gZxMUN PRSMtyR4/TnVjCWQlXBYDGJ1TgIuT5m8dQyjM7fnm/b/J/Vk9NyUpatm+knLkDcsSV+o /qFGer6NHuYRayBvuSMChubiUJLOLeJJja36yP5tNzWNNlfhKqk0aTgBoCiWKITgjc3I PgqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZYtM23pB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d22-20020ac85356000000b003437a690351si472281qto.175.2022.09.20.15.33.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:33:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZYtM23pB; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaloT-0006J5-7y for patch@linaro.org; Tue, 20 Sep 2022 18:33:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzg-00068C-5Z for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:12 -0400 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]:46906) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagze-00021N-Gm for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:11 -0400 Received: by mail-ed1-x52e.google.com with SMTP id z13so4812890edb.13 for ; Tue, 20 Sep 2022 10:25:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=+HHAGmPTEVaK8BLouLq5FfiutB4A/NBtflNNRIi+YP0=; b=ZYtM23pB/RlfGGkVj8PkOULLBQpEgqmqGuP4EZwn5vnCh/Uk38KM5dS3Aj6N+974Uj EincOuLBxWshGjN79jRwI7GXngY+y31PTOznG7KoxwN9gy8H+XcWDRkjA4/i4IZOCmpZ bCSEkIdfJkpb+iggUntCiNhQyh13N1EcH5Hi0h6MmyHbTWvWcttJepe43xD+SAoBWvxW Yv4Z8T8qrA3+Rv6NQhYhMzsWqce82ADrOA9KFL7EtSez0GrxIxAyOgRhAGjC9xjxbwke A7xnCi5CGv0SRFTg4u+oDW2mO784HbgF2GMr53pKMtwkjcykPVlMQxqwX1fABJnbPAhs E2FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=+HHAGmPTEVaK8BLouLq5FfiutB4A/NBtflNNRIi+YP0=; b=rczN8GoYgJy7NhEg4vxyefmK7GNnDVDFTo11a7X9HqRTTb9dG84ewSjW8rwlAOf9Vb ItWws5hK4ptQNHuJIUqsBX3T27GrZSUerYlZtlCu/9jwn0bIJCMmTiTSZvMwQVD456tJ LPcXUvu6BITYbG4VnE5yB7suBFQvR3eir9S3KjMpvNBppZ2H4rb+IrVTUs+rOpY35zV9 8sFRuVIvrU1PlcuutxKsCGI5ikVnNz6XTMIL96tIx3EShSSGJ8KNc7MYsQHeleIeSGDu h6DL1p+5VyGT4oZDH0qQCGGc8VYfAFngEpVYiKkjMbxmjjk9Zyy0k2F6GTJ5w+tuUtE/ 00oQ== X-Gm-Message-State: ACrzQf10ZnbSB4wH0dHzN6tB51VQSGl5sNLbWF5UZlFXeOR/S6jMkEqP V6MbfSmPc2YTvSXXxJUWZl1hQw== X-Received: by 2002:a05:6402:11d4:b0:452:a97c:cd36 with SMTP id j20-20020a05640211d400b00452a97ccd36mr21459262edw.53.1663694708993; Tue, 20 Sep 2022 10:25:08 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w23-20020a170906385700b00780f6071b5dsm129581ejc.188.2022.09.20.10.24.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:25:04 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2B4311FFCE; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 23/30] tests/docker: update and flatten debian-all-test-cross Date: Tue, 20 Sep 2022 18:15:26 +0100 Message-Id: <20220920171533.1098094-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We also need to ensure we install clang as it is used for those builds as well. It would be nice to port this to lcitool but for now this will do. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-24-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 3a8bd75473..091c0d8fcb 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -14,7 +14,6 @@ amd64-debian-cross-container: amd64-debian-user-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 24cd44e667..ddcc502049 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -129,7 +129,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # Specialist build images, sometimes very limited tools -docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index dedcea58b4..2beb077fb4 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -6,16 +6,24 @@ # basic compilers for as many targets as possible. We shall use this # to build and run linux-user tests on GitLab # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -# What we need to build QEMU itself -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ apt build-dep -yy qemu -# Add the foreign architecture we want and install dependencies +# Add extra build tools and as many cross compilers as we can for testing RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ + ccache \ + clang \ + git \ + ninja-build \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-alpha-linux-gnu \ From patchwork Tue Sep 20 17:15:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607651 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2049487pvb; Tue, 20 Sep 2022 15:06:43 -0700 (PDT) X-Google-Smtp-Source: AMsMyM65Xl4ExTOkWyrCECBF7CrEhb5wFntl4PvsygDz32pxuiuPNZ/9Y+z4sq2RpL0ZTUuTcZDT X-Received: by 2002:a05:622a:170d:b0:35b:a558:aee1 with SMTP id h13-20020a05622a170d00b0035ba558aee1mr20947168qtk.527.1663711602930; Tue, 20 Sep 2022 15:06:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663711602; cv=none; d=google.com; s=arc-20160816; b=M6SNSv5oCJbpGUU4lF+KWriE2Ie0phb+Wmt3cvH26wMIa6TKXqZcgbVPoNF0wJunNl McBlEllI5KqyWY5FstEeZl0cR5AQRm46vapObGufqbHehudqZ6RYYugF4W0uPEKAgWy4 1Xy/d5m23wfAQMHmT4EBtDIiudeB6z/09Lmu3arwr+c6LGTW4L2GgmhGxHQnnN+Tby3g zbgD8RCSWMyyWNlDwqViweN5ztL9fg+b+rSuCPftqyPZY6A/CpJY12VzAJHijvgrtB4x sm9aqBX4PwtJ38bED2Sw8Gmbyo1y06k2JAEcWcqDcCAQWGAbeLqi0oPre3qQgy/0fcmK dUVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3dsFavzDTb9lwDtGm2WAvmjX0ZIRpS6ht5ulPEZxGuM=; b=CyvQJoQBL42bNq/MyV2LMUtBJ2QIGNCj7e1VcPiS3pLwSYyOIwKGeqU7KW43/1E9cA ww81t2wiOkXSNpOHLOHhKF6Qmycs31fA1KsTijrZL1qxpfdgCS3+G0JZ15AWZ9k8o6qo HXqGGLKluW9IMW4wZZTYXn04iwRCz+Xj2iAglrEIMPY6IlACzHKciYYiv8x6/B1K1xyJ J8PDtSiTp8tgZdgc84gC/5+FqmPVKDxIGjOUhIw2NxJnc9rxf2R5xAbfTXuqYfsBkWN2 fK8b/Hp1hgkQ1Jn2wqd95O529ihDsElhpSK3kS2yw3qQQjqLB3DNDOegwnS1RtRRqAKi KRZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DxRl9rY+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id j13-20020ac8404d000000b00342f7ac2548si448711qtl.563.2022.09.20.15.06.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:06:42 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DxRl9rY+; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalO1-00079c-9s for patch@linaro.org; Tue, 20 Sep 2022 18:06:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54362) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzW-0005qW-Lt for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:02 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:34505) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzU-0001ot-Pk for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:02 -0400 Received: by mail-ej1-x631.google.com with SMTP id y3so7922081ejc.1 for ; Tue, 20 Sep 2022 10:25:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=3dsFavzDTb9lwDtGm2WAvmjX0ZIRpS6ht5ulPEZxGuM=; b=DxRl9rY+s4PbWTvZBYYBTn6C4TG2fLvM3/dG7bVAq/CDS/zOo9jBWt31HiJ6AWQu2N tZtxSswvnFPxQql69/hzf415BHukVFyVadLbkJbnElGaYO/y43TP4/mlJ7ubFCxPtcGI ZxWoSKeLuE7tsiabFR8gvVHUKvr3HWJ4xyOvUCqOMbRzlVVyye4IJWtIbR1b+4vu4pjF dcyZlHjhDNEh/DjOEvQ/eKjEdWmzZvqAiMRSnjxXaGKm1Ot4v7n7zzB555iNuKssEXMe zaJIfE6WdtyLi7KJQnOunirqjybBb0IDPMYvr/WeXfNpJTk9kxA9AaFrRPh8/GgRKFvI ZtAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=3dsFavzDTb9lwDtGm2WAvmjX0ZIRpS6ht5ulPEZxGuM=; b=sm08dtnp4jYJB/JrkOIh0t2YljjI8GGGzbQpnJq6GaouaJqpcPgV8SxCnQizpgYQnw E9XgRrh5c1maEWr/ZSsWWWi7t9aN+O3WuQvbhBeKj5w3daXZfDPqEgnU7+5sdXoFiQyS 41aRsfOKgWAloiVFsXKdLfW3AS4b2C+URq0rMLATJrMX3vDZ06UlnRKhU3HqVzVQ36xy yTrNB8UHHO8bMIKuhVad0DYdd6vYqLC9Yy5zbfvlj/fCD403aPNJYACg3MYaVhEeaARs Uak4wx58aVtNm96/v7OAOujZcCy07pg8ptUEMoNOYH6ZUEyEorYyNabVtQi8wPUYyjTo +NEQ== X-Gm-Message-State: ACrzQf2ViqtaSG5AtzVmPLRB6J/lYvP1DqV86WJX7qT2oLVVYei8R4ZW g2V3pd6zsYtGVQNiML+QcvFISQ== X-Received: by 2002:a17:907:7215:b0:780:3153:cca2 with SMTP id dr21-20020a170907721500b007803153cca2mr18017124ejc.427.1663694699413; Tue, 20 Sep 2022 10:24:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t20-20020aa7d714000000b0044e91d8ccd2sm203847edq.50.2022.09.20.10.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4AD591FFCF; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Ed Maste , Li-Wen Hsu , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 24/30] tests/lcitool: bump to latest version Date: Tue, 20 Sep 2022 18:15:27 +0100 Message-Id: <20220920171533.1098094-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=alex.bennee@linaro.org; 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, 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We need this to be able to cleanly build the x86 cross images. There are a few minor updates triggered by lcitool-refresh including adding "libslirp" to the freebsd vars and opensuse-leap which will help when we finally drop the slirp submodule from QEMU. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-25-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 8fa5a320e9..1a5959810f 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 8ed7e33a77..5e5aafd7e5 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 047a435ab5..041cf9c1ff 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -66,6 +66,7 @@ RUN zypper update -y && \ librbd-devel \ libseccomp-devel \ libselinux-devel \ + libslirp-devel \ libspice-server-devel \ libssh-devel \ libtasn1-devel \ @@ -127,7 +128,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 99803b343b..e1f4ed7c80 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -137,7 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 324355cf62..e3712b7912 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 324355cf62e86fb551408575afb123bac989ac37 +Subproject commit e3712b79122180fdb3b7a7ea8cbee47ece253f97 From patchwork Tue Sep 20 17:15:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607647 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2045532pvb; Tue, 20 Sep 2022 14:57:57 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6IuS5wjemE5XiBIPi4UhRgx82aLlmXq5Z8+0Y9OjjpJ+q64PGFQwPj9XgSJTIU1MGediJx X-Received: by 2002:ae9:f117:0:b0:6cf:3b2:5f6d with SMTP id k23-20020ae9f117000000b006cf03b25f6dmr9485027qkg.706.1663711077057; Tue, 20 Sep 2022 14:57:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663711077; cv=none; d=google.com; s=arc-20160816; b=rgA/aw097PSPaG5C4DVCP29fV8Ff9FNfc15dzJWiGr01C1KrT3w4WNiWObSlvV3oo9 I2IR5dKYl6kynbhNrhYWOTUJeq9zKRRqSbxCRThYke3uQqSDV4DS5dndUrKd87v8wIWs ZueIcQpQuxPMxotLnrxyX0hcMV3lkzfiQKAnlH9Mq4psuEIgb6E/FmcbzqSIV3a2I/er EoKtNQ+lY90CgThex+EIjEY7Yhw3glThciO7VdI5d3Nq2usrTjxpcrOx5aQXDy7bmqyj g1TvUHosgvOkveY0xr/WxTA+jVYL0a2YGXDkrhG1fe/iFrNjO/sR3KtI7w53RMydIeFu UM2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=UzR2D+6N94dMx17IDc13/hJBj0Ma91w/F29E9gyQ68w=; b=R2BpRguXqKV113zLdg0ynX9GCYhKCuAKtHy6NH6Vz5UEp7WwUXauZxPx4dBVpU7p/X zlUIXMxrIrzHXteVz/ABhuQDyXphLfHSXDhqk9xWappCiyWTVApy0OMGrhVWEXV6Cx8B zmrV3K8WEjZJXBkIguAW1s/+cOUcrzHjvYo2805266ESqiiFyWRzk4QVbizdBUb5ufUC JobQQCK154UU1yy8TfU7mBx5IvRAVSm5X146/Ls3RxHSh4ph0ZoGGElaKll2YNVbt871 mnar98paniKTAhvXBEvXSG4NvUhM18Lp/Y+rgPOGijRDXUPJYir4yiBiLzvmAq3B5zKu jKWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oItUvDc4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id e11-20020a0562140d8b00b004ad26a4e7e2si548148qve.74.2022.09.20.14.57.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:57:57 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oItUvDc4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45682 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalFc-0003br-Gh for patch@linaro.org; Tue, 20 Sep 2022 17:57:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzU-0005kK-7o for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:00 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:41496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzS-0001o2-38 for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:59 -0400 Received: by mail-ej1-x633.google.com with SMTP id hy2so4165387ejc.8 for ; Tue, 20 Sep 2022 10:24:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=UzR2D+6N94dMx17IDc13/hJBj0Ma91w/F29E9gyQ68w=; b=oItUvDc4tiMqzndHnYt6jez2pM2pswE6wNaZ89r7CGcTFP+TLH1Vtd+kA6fuF3pDXL jw6/eYPe+SA41WiUMuR7SXLELvXx4n5GZtPc0n952q8VdG0+8ndLfKNsTFoiETrPadbH AVbrdtQRdlctMFq54okg/RBc+pwtTshAPYZDAYEiAOVnrZ0V2NVE6goYCsUnvHkWTMyd y8qDVCqc7NWtaswrg7U6b+1cbF7xVVEbPLsCDW429KyKlhgDun3Xh6vG7XdFevXT8bx1 sW2TrXA+DUIrdOhhyZbz0Hydm01Z3u41SEJ/HRK5FpVEUVJDMk/DW1hmpkcu2lcf6X5m BhmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=UzR2D+6N94dMx17IDc13/hJBj0Ma91w/F29E9gyQ68w=; b=SZLcsEtwCU0EFnX50z3R3O58JuNdLaO0xzt3474hKavPhS3qDFjjY9hyQNm+7HmF2d c8J+cPDBV+lLXBgUCLpRZX/KHqwpJUlArIGk6k670YskbMdnxuGeNtu7UOFWYXcLLfAO nwLPyu4OxJyI58EkwjOuHdl2Pagwwi2zzIu3rkPQY4/HlUtuCPaqCbuqcj4BVZG1Uhb2 A8ndfpbqVz1QjN3xJj1+3kXWtPm4pLAPhp8kbN1LPY+dIyttUyFPPhWK+PFgyv7eeicL Bd1t7tWYn4/7Z/6PqGuD52NHQzEtf8DHS6PLEMYA1e8k84NXNk7AKcgJaqmwZnimMlo8 q9OA== X-Gm-Message-State: ACrzQf36CVe4P7uhjDvF8jaiUG7k3gn4G3UQhb4NV2C94TR+UzCxvX5o Bm1KinINRrcdRBPu4z8mRmk/0g== X-Received: by 2002:a17:907:e93:b0:77b:e7a8:2f63 with SMTP id ho19-20020a1709070e9300b0077be7a82f63mr17074548ejc.94.1663694696247; Tue, 20 Sep 2022 10:24:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id i6-20020a1709061cc600b00777d41ba812sm155014ejh.113.2022.09.20.10.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6A90C1FFD0; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 25/30] tests/docker: update and flatten debian-amd64-cross Date: Tue, 20 Sep 2022 18:15:28 +0100 Message-Id: <20220920171533.1098094-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now lcitool has support for building a x86_64 cross image we can use it for this. Signed-off-by: Alex Bennée Acked-by: Thomas Huth Message-Id: <20220914155950.804707-26-alex.bennee@linaro.org> diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml index 091c0d8fcb..2d560e9764 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -7,7 +7,6 @@ alpha-debian-cross-container: amd64-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-amd64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ddcc502049..a0f5109628 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -75,7 +75,6 @@ DOCKER_PARTIAL_IMAGES := debian10 debian11 ifeq ($(HOST_ARCH),x86_64) DOCKER_PARTIAL_IMAGES += debian-amd64-cross else -docker-image-debian-amd64-cross: docker-image-debian10 DOCKER_PARTIAL_IMAGES += debian-amd64 endif diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 870109ef6a..7d2feb7bf7 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -1,22 +1,168 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker x86_64 cross target +# $ lcitool dockerfile --layers all --cross x86_64 debian-11 qemu # -# This docker target is used on non-x86_64 machines which need the -# x86_64 cross compilers installed. -# -FROM qemu/debian10 -MAINTAINER Alex Bennée +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture amd64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - crossbuild-essential-amd64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a amd64 --arch-only qemu +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture amd64 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-x86-64-linux-gnu \ + gcc-x86-64-linux-gnu \ + libaio-dev:amd64 \ + libasan5:amd64 \ + libasound2-dev:amd64 \ + libattr1-dev:amd64 \ + libbpf-dev:amd64 \ + libbrlapi-dev:amd64 \ + libbz2-dev:amd64 \ + libc6-dev:amd64 \ + libcacard-dev:amd64 \ + libcap-ng-dev:amd64 \ + libcapstone-dev:amd64 \ + libcmocka-dev:amd64 \ + libcurl4-gnutls-dev:amd64 \ + libdaxctl-dev:amd64 \ + libdrm-dev:amd64 \ + libepoxy-dev:amd64 \ + libfdt-dev:amd64 \ + libffi-dev:amd64 \ + libfuse3-dev:amd64 \ + libgbm-dev:amd64 \ + libgcrypt20-dev:amd64 \ + libglib2.0-dev:amd64 \ + libglusterfs-dev:amd64 \ + libgnutls28-dev:amd64 \ + libgtk-3-dev:amd64 \ + libibumad-dev:amd64 \ + libibverbs-dev:amd64 \ + libiscsi-dev:amd64 \ + libjemalloc-dev:amd64 \ + libjpeg62-turbo-dev:amd64 \ + libjson-c-dev:amd64 \ + liblttng-ust-dev:amd64 \ + liblzo2-dev:amd64 \ + libncursesw5-dev:amd64 \ + libnfs-dev:amd64 \ + libnuma-dev:amd64 \ + libpam0g-dev:amd64 \ + libpixman-1-dev:amd64 \ + libpmem-dev:amd64 \ + libpng-dev:amd64 \ + libpulse-dev:amd64 \ + librbd-dev:amd64 \ + librdmacm-dev:amd64 \ + libsasl2-dev:amd64 \ + libsdl2-dev:amd64 \ + libsdl2-image-dev:amd64 \ + libseccomp-dev:amd64 \ + libselinux1-dev:amd64 \ + libslirp-dev:amd64 \ + libsnappy-dev:amd64 \ + libspice-server-dev:amd64 \ + libssh-gcrypt-dev:amd64 \ + libsystemd-dev:amd64 \ + libtasn1-6-dev:amd64 \ + libubsan1:amd64 \ + libudev-dev:amd64 \ + liburing-dev:amd64 \ + libusb-1.0-0-dev:amd64 \ + libusbredirhost-dev:amd64 \ + libvdeplug-dev:amd64 \ + libvirglrenderer-dev:amd64 \ + libvte-2.91-dev:amd64 \ + libxen-dev:amd64 \ + libzstd-dev:amd64 \ + nettle-dev:amd64 \ + systemtap-sdt-dev:amd64 \ + xfslibs-dev:amd64 \ + zlib1g-dev:amd64 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/x86_64-linux-gnu-gcc'\n\ +ar = '/usr/bin/x86_64-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/x86_64-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/x86_64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'x86_64'\n\ +cpu = 'x86_64'\n\ +endian = 'little'" > /usr/local/share/meson/cross/x86_64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV ABI "x86_64-linux-gnu" +ENV MESON_OPTS "--cross-file=x86_64-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-linux-gnu- ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 2a59150322..fc604d8a21 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -119,6 +119,13 @@ try: # # Cross compiling builds # + generate_dockerfile("debian-amd64-cross", "debian-11", + cross="x86_64", + trailer=debian_cross_build("x86_64-linux-gnu-", + "x86_64-softmmu," + "x86_64-linux-user," + "i386-softmmu,i386-linux-user")) + generate_dockerfile("debian-arm64-cross", "debian-11", cross="aarch64", trailer=debian_cross_build("aarch64-linux-gnu-", From patchwork Tue Sep 20 17:15:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607653 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2051829pvb; Tue, 20 Sep 2022 15:12:25 -0700 (PDT) X-Google-Smtp-Source: AMsMyM63dKdGJHi+rHzGT03WlvV/S+MAkC8QyCRSKqY7eP8PIrqHR5afx+TLlcBpzM+r4UVzFfwt X-Received: by 2002:a05:6214:daf:b0:49f:5ce8:e628 with SMTP id h15-20020a0562140daf00b0049f5ce8e628mr20791341qvh.115.1663711945522; Tue, 20 Sep 2022 15:12:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663711945; cv=none; d=google.com; s=arc-20160816; b=aeFOrUGBPOO7J796uu5Wk7w0Rig05rP3OjJ7jFOqOVheTUt+24Baat9UkKTqwpj5hM CurmCggcUGwZ38Lp0TkeJSb/vk3WCm80c78TcBmjBs2uyuedmVkq5aFs8YK7vZc2I0xu h86xWu0v5uVrhZmpp8RSCkA4Pbwejvf+BnvadM/Gpu+soYfOAb53aRU96Src+iFXuClb 0heJ0baDz5w6JxJDhFgL+kV7N0CDtbwKu4jPafJFJCqhpQckAnqfgQSnuHRHiYafbzeN tvE5Isn8bN33X9qp4bcrmgmbpuMV3g8equRmE2ud72Reum39VhBTgtNyluKQFAGa8IGU fheA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=uWDiF1jWgciTeV2Qg8CZ4j2xTGM9MuFQveZ8m5IhBP0=; b=eYxW1jtpyx/x/cQ2AVATyDSl+njB5oP733+HC9GLBMxFFNnUKmPoTDZkx0polhZxuO qRTYZg7iNA91k5W1/qNoY4ypsshcelrOyeNFE273T7B2cWYLUNAjW9GbV67nKMBhua3w OC/Ds2QLIIHAKxERUM0YjiG18UdGqkuRP+Zzgk4i/Mzh9V9xlNgxa+mBfsTKEW9XImW9 ceTuR2ZOiwypWelCvAG3Cd/G8uZjejj72WcGej5Z/Bjfb3m6OniHszQRBLYXvmr/BI6W K1zbSeIdrIaISYrYJZKPDjGAAlr4fBtHP2iwaMTV8Rf/qnXAxU5I3g/Ee/D8UZojao3/ +iAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pP4CILQr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ey12-20020a0562140b6c00b004952caaebb2si640005qvb.174.2022.09.20.15.12.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:12:25 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pP4CILQr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalTd-000236-0B for patch@linaro.org; Tue, 20 Sep 2022 18:12:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51388) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagze-00065s-Pk for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:10 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:41741) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzd-00020o-3M for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:10 -0400 Received: by mail-ed1-x52c.google.com with SMTP id z97so4843596ede.8 for ; Tue, 20 Sep 2022 10:25:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=uWDiF1jWgciTeV2Qg8CZ4j2xTGM9MuFQveZ8m5IhBP0=; b=pP4CILQrgbH4zok1CZ7EWVql/NlX8q/s2f559164fUK7rBw0vHbaDluXuegSvvHN82 WqizcRsdhKRKXabMnZ+V6XOnSSJ2lxNKnMSId0LDLC3gDqMkfFmGRJl+SQPBx+mypjxk l3lrj17AHvp3VhRFNP7XK4W+ZTSCUzy9cEKfkU/rtkk5AvYjA69cl3/sbpVmngefSvkr 3tsfsnrMHeKsLidzyGAtjLGPnR6JpawHUThFxLsycBWxYsLVnlVG7WIO07scoKYbzVfz jTVjv7YC5n7+EIiLucfifA9M8/cz7V31w+hmqKWjaLRVjs8Vs23Y5nPKCcBiNvyfsyAR UceQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=uWDiF1jWgciTeV2Qg8CZ4j2xTGM9MuFQveZ8m5IhBP0=; b=KbO/t939m7m16bwDl39dFlhV3Kc/EKSk7J7xnnjrOm+hPrTiOGAOQxIXN+MHNJ2cC1 pA1QvSWEuj6kDtpff6M7Uv2sa+YjMrErpRwTU/W/vX2zcm/g4fT/sMyu1Wm6EkgySE4p gOC/Sx2iRBs0Djo3CQ8zH/WJUo5+lRGysl7lyQmqxyDlmp/x9rcfwt1WnGH0Kz1B/2FK pYVjO9ie7tRjsBk+JAznq8Br0xNvMSD8ajCXLlFSClQx4fxzMx3+CWQgF3qBzYlfEl2H iFT5TNRojomaysCfb0DRuBomndJmyMgx93jppNltAswp4i9nQg274kVoTeWdQlaabAkY rS/Q== X-Gm-Message-State: ACrzQf3dNV+8myKmISqiD8FspufKFnGpji97yFwPOqWTjn7/fkeZ2ndE 2nn6yd26jV07z9alKuJ28an1vQ== X-Received: by 2002:a05:6402:35cb:b0:451:6a0a:6688 with SMTP id z11-20020a05640235cb00b004516a0a6688mr21251120edc.415.1663694707648; Tue, 20 Sep 2022 10:25:07 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d22-20020a1709061f5600b0077b2b0563f4sm143721ejk.173.2022.09.20.10.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:25:02 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 83CCE1FFD1; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 26/30] tests/docker: update and flatten debian-loongarch-cross Date: Tue, 20 Sep 2022 18:15:29 +0100 Message-Id: <20220920171533.1098094-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52c; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52c.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. In this case it is a binary distribution of the toolchain anyway. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220914155950.804707-27-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a0f5109628..1d5a6f1fb4 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -128,7 +128,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # Specialist build images, sometimes very limited tools -docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker index ca2469d2a8..a8e8e98909 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -1,11 +1,13 @@ # # Docker cross-compiler target # -# This docker target builds on the debian11 base image, -# using a prebuilt toolchains for LoongArch64 from: +# This docker target uses prebuilt toolchains for LoongArch64 from: # https://github.com/loongson/build-tools/releases # -FROM qemu/debian11 +FROM docker.io/library/debian:11-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ From patchwork Tue Sep 20 17:15:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607656 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2054462pvb; Tue, 20 Sep 2022 15:19:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM75s0u1bE7EqX62Y6j/DsgyMGQqS1rApZROGIIGGneA0efrwrAdBgg1YSlP7xpDg9Ab0QVm X-Received: by 2002:ac8:5a16:0:b0:35b:ac5b:36ed with SMTP id n22-20020ac85a16000000b0035bac5b36edmr20916491qta.431.1663712377315; Tue, 20 Sep 2022 15:19:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663712377; cv=none; d=google.com; s=arc-20160816; b=0d4Il6aewLbFgfL4MAxM9qyeHZ8/19kW95G4BSZjD4pG/WO0In4+HaQmAip0rPmnUd 3wh6wArDjVM6ynNpn0KdBV88rwwc81+7OWm2nSJB+Zy7P7rMkYA7SCWLBNpA4yxu7nTi gXcxfHasMwtR8I919Y00LQ96l23k7srUM1bgp2WtnmL3d1Lts6Vp8rgpToENLdPxYxQV u1xfCKBV9nWY2+xFTudTXtmgokdeVl2BrU3wQn0mqTKneEjzH7g4cAGOyurNGtrwWZr3 xng6xuQj+mzQ78kqrztCqnr2yM6IcWb+GEqtIlgvsvEIO1PWoCQtuZHTI/zHNw2rkXyN crfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=x4S1RGKB9TLIMCKmtB9fa0XzaDftdi2Kh+Izh7wFJ9E=; b=JsZhyVABs9xVPVf8oQf8wfeWRVflK7BdxqEY9yULWabLU0KMKZpEZZOnhvlGGAfRxG 7mGvSmEeGJhnYtYyD/UuSS80M3Si8/M2EkjVxgnyS/HK6q72fgKeNgNftScS8fNgMMcJ tpiFpWizLH5Bfb+Jdzu24tLDYbW+K6oLxv/r4vp0D8mSP0o3xfnpm0Z19mH9HI7epg7g DQX0DxwqKmpgpdPJGxAzdfcibn+bIdMNgqSUT4f0VnHSytEOEYrbSDnQ00mSN0rZ0kzX 5PVvCF7F64QAj+9olSW5C1n6jUBOqhbqNcwuNMI6Ob8rzqZJBaJ7MNHQtHceulNV+NfA XTGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QVwo8d6Z; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t17-20020a05622a149100b0035cd017300fsi521271qtx.655.2022.09.20.15.19.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:19:37 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QVwo8d6Z; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalaa-0001x8-QX for patch@linaro.org; Tue, 20 Sep 2022 18:19:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54356) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzS-0005h5-Kc for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:58 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:45568) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzQ-0001nE-Px for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:24:58 -0400 Received: by mail-ej1-x62c.google.com with SMTP id dv25so7763470ejb.12 for ; Tue, 20 Sep 2022 10:24:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=x4S1RGKB9TLIMCKmtB9fa0XzaDftdi2Kh+Izh7wFJ9E=; b=QVwo8d6Zj4+94XjrCtMDe3MxtOgopn8qlX983Untw/YaBevLdJaY7PqT0zBx5HouSp KzONekB7T9HBc/o0f9BECVS8u2K25vLu3eYcvLWH46zBG7XL+gzxQdyD8xa0SH2Lkm4w 9q0ftK4nvLrRxe0KC4L+clLDS7dG+OcqRjMvMOnLCdknC0JIvogzo7GFJjCLn0qu6I9n D5HdE973ZfFBh2lFYKgeSO0Q3gfWR3BU4ag7ySbCZFra1DdzfjUf2cywwddkcNoqbVRb SQGRJsK+GyXJwbYXV8qlaeggdFp8T0cM4pa62Cc6u6dK/d80i8F0rHHeVeGFfmtrWLxm HZHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=x4S1RGKB9TLIMCKmtB9fa0XzaDftdi2Kh+Izh7wFJ9E=; b=cGoEFF8BA9X9D2JNoUjCpzSYS4IdOO78kQj+grzWa0SXg84MuxgCa6OPuCSSxm/GyR gykktr9usNShh7t5syoiI99XQruhrZjwpPZ5XZta/J21g5k4qzSg902KtRCvN15Hlqgz QU28sYaghXYkiprp5CVdvANjeo/FthHchkzFAx/dJfFpbdqS0etfw8DifFEIMpDXOXug 6DR2l7vT3su/PPawI7S24Ni2MZH61jle9kXt8m6GGAczm5oMxQ+Tc3E6euVbtdSQcPM6 u9y1hA74wXC4QS0Q2yR5lKPtYqMNwbRzEb9opl9Cg+GAwZitxzGXAq5Qce7z3SB7yO8i RLqg== X-Gm-Message-State: ACrzQf3Qw1vGwA6OlFAnyEW8FGJq7DBlZfDp2D5N7b+Nq1SKb33ic0fF sCmAfYHRN8lIyc5YFTfAHbQ8Qg== X-Received: by 2002:a17:907:6288:b0:72f:90ba:f0b2 with SMTP id nd8-20020a170907628800b0072f90baf0b2mr17030507ejc.696.1663694696002; Tue, 20 Sep 2022 10:24:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h1-20020a1709063b4100b00740f1a58e0bsm213279ejf.30.2022.09.20.10.24.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B22C1FFD2; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 27/30] tests/docker: update and flatten debian-hexagon-cross Date: Tue, 20 Sep 2022 18:15:30 +0100 Message-Id: <20220920171533.1098094-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62c.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile as we do not some of the extraneous packages from the base image to build the toolchain. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-28-alex.bennee@linaro.org> diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index d5dc299dc1..8d219bb81d 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -2,12 +2,10 @@ # Docker Hexagon cross-compiler target # # This docker target is used for building hexagon tests. As it also -# needs to be able to build QEMU itself in CI we include it's -# build-deps. It is also a "stand-alone" image so as not to be -# triggered by re-builds on other base images given it takes a long -# time to build. +# needs to be able to build QEMU itself in CI we include its +# build-deps. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim # Install common build utilities RUN apt update && \ @@ -15,11 +13,18 @@ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bison \ + ca-certificates \ + clang \ cmake \ flex \ + gcc \ lld \ + make \ + ninja-build \ + python3 \ rsync \ - wget + wget \ + xz-utils ENV TOOLCHAIN_INSTALL /usr/local ENV ROOTFS /usr/local @@ -32,7 +37,7 @@ ADD build-toolchain.sh /root/hexagon-toolchain/build-toolchain.sh RUN cd /root/hexagon-toolchain && ./build-toolchain.sh -FROM debian:buster-slim +FROM docker.io/library/debian:11-slim # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list # Install QEMU build deps for use in CI From patchwork Tue Sep 20 17:15:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607658 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2057382pvb; Tue, 20 Sep 2022 15:28:27 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5i0BFp/9i+CNL1CQns4q+1M4F8ebfC3eL59Q1LMxK5bQbgEU4vMYrt5X23fBa1tE9dgUyF X-Received: by 2002:ac8:5b53:0:b0:35b:a628:873c with SMTP id n19-20020ac85b53000000b0035ba628873cmr21899662qtw.398.1663712907197; Tue, 20 Sep 2022 15:28:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663712907; cv=none; d=google.com; s=arc-20160816; b=HNkdpuJCDVfKwviSUw/P9BtMRDB0RacFc6V3rmt8IussO1Y9bNt+ovPDf05krEFPWD ApzMYdMG+wa1fBt4dKB72pK/1kCjtNQ/L+YaJZOfwaqKrI+u2CHKAuatndBHrVwZy5vA dk4Q5A3pFhx9XM6Ts8W0SyPpYOKeXFRnCiQopVQiwUw0y2aTinjoQATC4CdO6+pv2WRY YEOQtTCyVF35EDf+uEGTtEZ5EdCVarJdrCD2Brv7pQyLvdWGwA7m61jwV+/XjHa/UBwY mQVR0TEZ+pfLMuxG7W+MVSBYDu7TVe/Fl5sKnlplFxNu3PfKmt23NeHgI4Tuybv+Op5b GEFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FXHDHf2ajcZm8Hn3yqqDo1FsuNZsNVS58iHbQW1B8lg=; b=QHCMPnsav01qScPHlT+OnRpWIetKngd7Kk4EpJGIvxbqMEsfsOqUuicoK6AQ6F5qLh LwZtngBCAZ8I2xdK41XjhkU/6BaahweSytg6GjbfnY9zYv2sgIaA+7YJhs6xRmQixf0o vREIFqeiKVN86NG01lCbGnImiQev73AzNCtJqxKuY2ci7fag/Vzo7GMyJFfA2cHEfLi2 7sfq7540f1s1bLHhgzz0fogkNv1Zq23E6aPVW8Zkix9jqEVb+1kQNkuy0PhZSPNCHuXF 4Ct7hGr+VqvMh9Q9+7QtOowcE2avdnOKa/Bj0PUJ7L4lcsaGL6bo3/Y3o7jg4GynIOP6 auHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="uasT/0Ig"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fv18-20020a05622a4a1200b0031f0b236fa6si477646qtb.137.2022.09.20.15.28.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 15:28:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="uasT/0Ig"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39132 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalj8-0008Hr-LB for patch@linaro.org; Tue, 20 Sep 2022 18:28:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzf-00067K-Jv for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:11 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:41496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzX-0001o2-Cu for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:11 -0400 Received: by mail-ej1-x633.google.com with SMTP id hy2so4166001ejc.8 for ; Tue, 20 Sep 2022 10:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=FXHDHf2ajcZm8Hn3yqqDo1FsuNZsNVS58iHbQW1B8lg=; b=uasT/0IghVPSiiE0CTdk53isKJpWCKYiBNhkrfp18QcYWC3R6w9WLacqTTx2CpUOY8 +P/OULH7OdysozvyJ2o7hh0OKUuIu8yq0/1xo9YWtYeJhKxjJxJLuI58PhhiJ/6uZBS8 6AXxQRnLCa1TqGpPHfFMbDPQ1tnu1fpi2nzycmt8pE6KlwAN5/LkfDtbzhfOLd3m+Gu9 yQxUqCT15WoDnjZgbERj/u7RQvUFvgSmQEgPhJjnkaj4q4ZVaV7SUHE5nxCTXjWakF8H l9kLVVh7Rd7fB0sfcoALGgz4BZaueDMFlJlVCEtA4CFZJLiykl3WYtUi5bBopwTdLrks 0fBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=FXHDHf2ajcZm8Hn3yqqDo1FsuNZsNVS58iHbQW1B8lg=; b=zzPbheAxLYFAmZknBho+krl9wL3JMeO+MeajETjo3DFgfUdcMDyEH07+BCexq6AcJQ JyEZq28QT5oa4wHdJsrv0HhGXmQDyJWEmv8t+D+kcUNFFR0u56Is/sx0sgMfWTx4zg3x LudKfvha0ZIBSYLoZESundTsRBpSXVypyyUHcTGOMcY1fhrEHQNAP+LneyaE2bBSeOFW e0v5d1dZDOnWbE0fsQUUFJE6uLFqsSGDqNzTvOYEmfYM16o13SmP+WKnAzS5fa/0Hbaf Choo52IKMw0LqN2/1EfGaY67+aE2WCoAVOnh9jycHWcTCAuaOPVQES8vzzC1xucytJEw igJA== X-Gm-Message-State: ACrzQf3q4q/42P9jFYEUjgKOzhS2n4vHApItRvnxpUvJChdAT4fzU+/o TKB/ELKgdM7kbJr/Cw/hC+fEIA== X-Received: by 2002:a17:907:782:b0:740:7120:c6e7 with SMTP id xd2-20020a170907078200b007407120c6e7mr17883091ejb.313.1663694702621; Tue, 20 Sep 2022 10:25:02 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id x13-20020a170906b08d00b0073dbfd33a8dsm194321ejy.21.2022.09.20.10.24.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:56 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B44891FFD3; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 28/30] tests/docker: update and flatten debian-toolchain Date: Tue, 20 Sep 2022 18:15:31 +0100 Message-Id: <20220920171533.1098094-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x633.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile as we do not need anything from the base image to build the toolchain. This is used to build both the nios and microblaze toolchains. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-29-alex.bennee@linaro.org> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 1d5a6f1fb4..a3174346da 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -127,10 +127,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(DOCKER_FILES_DIR)/debian-nios2-cross.d/build-toolchain.sh $(call debian-toolchain, $@) -# Specialist build images, sometimes very limited tools -docker-image-debian-microblaze-cross: docker-image-debian10 -docker-image-debian-nios2-cross: docker-image-debian10 - # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index 738d808aa6..d3d4d3344e 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -4,7 +4,7 @@ # This dockerfile is used for building a cross-compiler toolchain. # The script for building the toolchain is supplied via extra-files. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim # Install build utilities for building gcc and glibc. # ??? The build-dep isn't working, missing a number of @@ -15,6 +15,7 @@ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bison \ + ca-certificates \ flex \ gawk \ libmpc-dev \ @@ -32,5 +33,5 @@ RUN cd /root && ./build-toolchain.sh # Throw away the extra toolchain build deps, the downloaded source, # and the build trees by restoring the original debian10 image, # then copying the built toolchain from stage 0. -FROM qemu/debian10 +FROM docker.io/library/debian:bullseye-slim COPY --from=0 /usr/local /usr/local From patchwork Tue Sep 20 17:15:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607634 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2033824pvb; Tue, 20 Sep 2022 14:23:54 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7JBpyUYUvO2mcO9uxFBzxEReokY0ffMwBBoLydp/3RTm4+OV+efj954lBwI9HJtKqdRfvZ X-Received: by 2002:ac8:5c01:0:b0:35c:d08b:25b with SMTP id i1-20020ac85c01000000b0035cd08b025bmr18414138qti.311.1663709034426; Tue, 20 Sep 2022 14:23:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663709034; cv=none; d=google.com; s=arc-20160816; b=Vvau8BhM/302itgsIef5Onq4A/wGQm6LBTrrLOg8rZJgeOgA0F6YQGedaj+PGPVV7t Thw5WV+H7wdEdjX22uzybIIKh7PEs/xIZdEWKWSkyRqxP1uA7PIIG7vuPJW9FJcK/rvh SSO78UglqM3hUQL01Rkq3Ft6dyIPaxY6eMLQoRCmTqQA0kng6OO5ug05I69cTTlReKKi fqBWV9dXRynLUolEr1vSwOmSVEKNUoGa2IzxmambhQJlZh+komOHJqrZGCv5DmB6LlwK xFTGuXHOW0KLOBreXTrtSwq6u/orIENCkBVin2SPKpYuAA7q8whnEKeWO9D1QryMwu0M sS9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AnscUj/WsXzqq3s+vV4bQPFCFx5NHk6AZxIJISHW2ag=; b=tqpysa+G3rFFI9S/Y/QG9vboVOat+oCzW6jmRPqCe8AcMOMr2MC/o+DKpCM3TTMgMt 4G/C64rT+LaO4kaxg//vRyv1pHCLdDAq08RAEUNmtgDXvLZyemMG75kn0c7qduUHqWKL WrR+UY9Vzb7NL/QRi0J8wkiAwtMs+1rqPWNSbysc5lDOPy/hF+33FgbmMbMD9OOCMwdN cOdiBIiXGXACm8xpeSfPXF6UiOo5CAqEQoiQ3uY4j/YM5dJSagzQJl3uslJ/yD4/ZM3D D/U1YUmup96660AsfqqiRlWfIsaIFMWYNZW8B9i7kZSjfdP1VwNVVuD304hbvoQKOtzS Q4Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zd7ovdZX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id br35-20020a05620a462300b006c7939f25ccsi537547qkb.731.2022.09.20.14.23.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:23:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zd7ovdZX; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:60656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakie-0005AN-Ji for patch@linaro.org; Tue, 20 Sep 2022 17:23:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzb-00060c-Qh for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:07 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:43971) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagzZ-0001wd-HK for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:07 -0400 Received: by mail-ej1-x62f.google.com with SMTP id lh5so7812963ejb.10 for ; Tue, 20 Sep 2022 10:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=AnscUj/WsXzqq3s+vV4bQPFCFx5NHk6AZxIJISHW2ag=; b=Zd7ovdZXxz7IYhYYL7OsBAkGRlplC65dwk6Bwyz8raFopu2w4aK1xukAXtQjWQ9m7Z kb3LZJeKxagg3HK9L22koxtaMC2KHrCvZ6jXV9lhnUCeT7/RVrI9z3JRqWn0ua9vbrJW QQuzsKyc9es/R2HOSCP3zIgKzMUqBhUSCe3AVnfEhb+y85YWio44iqEJvnzLb8WbUToN vatA04IqDSUYd03h/gw6CBamnlbvgnL9Xm3f7FnJ3aVXE03mLjU1pFBpBRi6Co86jpDE Q/7jHRqjrckhZTh5I6ajRXbM5tlmjQYbhUMmilBrTkAM7ye2d++ehAhMKG8OErVqm1PI fxNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=AnscUj/WsXzqq3s+vV4bQPFCFx5NHk6AZxIJISHW2ag=; b=xT/I2NHMZuKfsEwuYEUXVXM8M7dJEmbZq/tkmSb5F1nUG+yaKzpLCb5RyWqEbQ6csX fPHM5YkBdlRu9j+rvZv7RDr14186nGaq6cO+V2xOVw8SrTdWAaRmSB1wVVZb0hMp2JD3 xAqyuR76XlaxoNqfu8MCGDNXUbijdUh8kvYry6QZtSfHBbxT6ssBs8AGVpm47ojEGXlU 1yQFL02phgwsm+JOF5SsxfnQWLCLOcCVIp64m9occaQE+OXOvZKL80Y/8PDqw5YXH4hG xDDLrFGeZ3qzFKCAABm6DEhUAdhXpc0af6nY1+/jVKQKBACENYsgI6PQn6NLtrvx1+sZ DCcw== X-Gm-Message-State: ACrzQf03YnhM2qPtOKOC/U8F+w+V9vgeJcTOuVMLC8b5VMLwpANFyThz L1si21ZF48MQgPsbHEA+06TigA== X-Received: by 2002:a17:906:8473:b0:77b:efa8:50e4 with SMTP id hx19-20020a170906847300b0077befa850e4mr17611222ejc.250.1663694703141; Tue, 20 Sep 2022 10:25:03 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id rl24-20020a170907217800b0073d7e58b1bcsm138266ejb.157.2022.09.20.10.24.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CCC121FFD4; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 29/30] tests/docker: remove FROM qemu/ support from docker.py Date: Tue, 20 Sep 2022 18:15:32 +0100 Message-Id: <20220920171533.1098094-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x62f.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We want to migrate from docker.py to building our images directly with docker/podman. Before we get there we need to make sure we don't re-introduce our layered builds so bug out if we see FROM qemu/ in a Dockerfile. Signed-off-by: Alex Bennée Acked-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-30-alex.bennee@linaro.org> diff --git a/tests/docker/docker.py b/tests/docker/docker.py index d0af2861b8..3a1ed7cb18 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -205,22 +205,17 @@ def _read_qemu_dockerfile(img_name): return _read_dockerfile(df) -def _dockerfile_preprocess(df): - out = "" +def _dockerfile_verify_flat(df): + "Verify we do not include other qemu/ layers" for l in df.splitlines(): if len(l.strip()) == 0 or l.startswith("#"): continue from_pref = "FROM qemu/" if l.startswith(from_pref): - # TODO: Alternatively we could replace this line with "FROM $ID" - # where $ID is the image's hex id obtained with - # $ docker images $IMAGE --format="{{.Id}}" - # but unfortunately that's not supported by RHEL 7. - inlining = _read_qemu_dockerfile(l[len(from_pref):]) - out += _dockerfile_preprocess(inlining) - continue - out += l + "\n" - return out + print("We no longer support multiple QEMU layers.") + print("Dockerfiles should be flat, ideally created by lcitool") + return False + return True class Docker(object): @@ -309,23 +304,10 @@ def build_image(self, tag, docker_dir, dockerfile, if argv is None: argv = [] - # pre-calculate the docker checksum before any - # substitutions we make for caching - checksum = _text_checksum(_dockerfile_preprocess(dockerfile)) + if not _dockerfile_verify_flat(dockerfile): + return -1 - if registry is not None: - sources = re.findall("FROM qemu\/(.*)", dockerfile) - # Fetch any cache layers we can, may fail - for s in sources: - pull_args = ["pull", "%s/qemu/%s" % (registry, s)] - if self._do(pull_args, quiet=quiet) != 0: - registry = None - break - # Make substitutions - if registry is not None: - dockerfile = dockerfile.replace("FROM qemu/", - "FROM %s/qemu/" % - (registry)) + checksum = _text_checksum(dockerfile) tmp_df = tempfile.NamedTemporaryFile(mode="w+t", encoding='utf-8', @@ -371,7 +353,7 @@ def image_matches_dockerfile(self, tag, dockerfile): checksum = self.get_image_dockerfile_checksum(tag) except Exception: return False - return checksum == _text_checksum(_dockerfile_preprocess(dockerfile)) + return checksum == _text_checksum(dockerfile) def run(self, cmd, keep, quiet, as_user=False): label = uuid.uuid4().hex From patchwork Tue Sep 20 17:15:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 607642 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2043357pvb; Tue, 20 Sep 2022 14:50:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5+NlKYLXojrGBPP7mqarCCaJmaRkRKNwqqyK+aS0Loj21BWsbIeUipQJLqht5Eyee+9N1h X-Received: by 2002:a05:6214:27e4:b0:4ac:a631:f551 with SMTP id jt4-20020a05621427e400b004aca631f551mr20776354qvb.12.1663710644443; Tue, 20 Sep 2022 14:50:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663710644; cv=none; d=google.com; s=arc-20160816; b=sA3Z4rz7o+h1wHg7w5a4oEICsnVrK0dPlzXI3UWfobmL6PyJQb+wAliUdrMIX4g2Jg ooE1urBZOtROoYSlwfqTDOuqV0SzZz0zCkBfv8nKSUvH8x4DqppJfTihPAymXh6UELWH 1AlER4qOLKVaduaHeUWOvo4wricvobmf0QnTu8zA4Ln8WZ+g8WodqpM4Qge313CIOAzo Oc8thJZyMnoK48rpWy31tlScJ5413ZWJOwPTRxTxoL1uyf2tkUdIPTcMggd3vLAp5WHJ ChBHyCMpl1/Iuok1bBC/WfDFxpfie6IwnfP7HdD0jeaDAdudGRKR6AffueNs4xIjJVzG iM4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jPKx4bLo5GwU9q6PEj03jAJlnFywQA8HkRlD35mQyEY=; b=Mbksl7g/T0AGDVgG+yvaJIXr3qLmGRBpdkzUfQQH1wVPpfHfrNa0Bd5eTmGFwi+06w w4ID55PH3NzKdTe3XQ/fJXv432qD++W0DK01gTzkxqxwq55/lpv/E/E+M7gBMJIXD6cb vvHuenLImrRVNjBXiDIU0MXGeuM2Ipn3rIbRHArns28oDsBiIYGod02QVvsFvcpTCAh0 9sm00Rq2/ghbzwUGC9WVGV6FwRydgbJExmcE+D21KItdET9NFR2rmgVc02XXpnxBF13p MhPeY9e7yn0YSdTJ8GTDMjePH7rO6oXZK7jxqmN7573ptYip6SoAt2CH2p32XaNF6dtO /fbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r9AJjD2a; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id fg15-20020a05622a580f00b0035baa4feb09si489847qtb.152.2022.09.20.14.50.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Sep 2022 14:50:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=r9AJjD2a; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal8d-0004my-V1 for patch@linaro.org; Tue, 20 Sep 2022 17:50:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oagzd-000631-BR for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:09 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:42968) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oagza-0001pC-4p for qemu-devel@nongnu.org; Tue, 20 Sep 2022 13:25:09 -0400 Received: by mail-ej1-x630.google.com with SMTP id sb3so7822066ejb.9 for ; Tue, 20 Sep 2022 10:25:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=jPKx4bLo5GwU9q6PEj03jAJlnFywQA8HkRlD35mQyEY=; b=r9AJjD2asohZgNfHL2ukcKfWs8j/jbo7+ws5BKCgcCi54b7Z2hfr+dtvNQZm64a6al aaS1aFrxove6+enppG70q3r6NsuA3c+f2dn7ONA2zJG7qWc2a5sdNJJdDIIsTG4ohEgG Q3InHztC362WhD+OR/I1t9E8IpKfEAsS4jyCO387t75KYAG4ogywVpYBUslL+lbUXA51 UGClRBdl2cSOrr7kH+S4Prw7GMfwowEvRTtFuW8I8xRUM9LtodsjOmqiX35To0jGNfcC MwiSpadOjSgZl3FDKk3aKFcTNVa40bGUvTfQyhnDR9jRnGFwczbbQJ+mWmEHXXMd5iVA yw4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=jPKx4bLo5GwU9q6PEj03jAJlnFywQA8HkRlD35mQyEY=; b=uf85dewrq6RwSC0uC4jNfW2XzsRKkJiFowf4+48lHktR3wf/TwI3k+YTHmVdDkYMPe rEeNfFnxm2WnNRHFt9kXuf+Yr+EVnyg0QwRuhu+mm8qPKIWNRi8ycz8bPaGHurnOgZVi 34BQLbGOa2D9Xl9pyTVTeuM7kKYjbX+7JVp86zpAQxPtnEIqcHko5nS02r0jv+lnWMSO rszoTR+t8clHaVDpCIIbZBKyXwSI5TV9gHvAhmAWx1Q7l47G9w8dKaDBLyzssKMIW3FM tFSR92ZbR9D7qymTD0Pfuq+6JGPdHe6/8/AqyPpPNgEObKM66rhNTGE91SsgywcDIxBp Uz/A== X-Gm-Message-State: ACrzQf3QDXmrg+HiwWgDX/3OxOuK5YFMsMZefftT32rv9qkEBataBoPb I381k8UhKBCtYPPyNAqeliiqDQ== X-Received: by 2002:a17:906:7944:b0:73c:838:ac3d with SMTP id l4-20020a170906794400b0073c0838ac3dmr17821921ejo.242.1663694705302; Tue, 20 Sep 2022 10:25:05 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id a10-20020a50ff0a000000b00454546561cfsm152307edu.82.2022.09.20.10.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 10:24:59 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EF0991FFD5; Tue, 20 Sep 2022 18:15:36 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PULL 30/30] tests/docker: remove the Debian base images Date: Tue, 20 Sep 2022 18:15:33 +0100 Message-Id: <20220920171533.1098094-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::630; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x630.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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We no longer use these in any of our images. Clean-up the remaining comments and documentation that reference them and remove from the build. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-31-alex.bennee@linaro.org> diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index f35f117d95..aea5b42356 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -375,7 +375,7 @@ locally by using the ``NOCACHE`` build option: .. code:: - make docker-image-debian10 NOCACHE=1 + make docker-image-debian-arm64-cross NOCACHE=1 Images ~~~~~~ diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.yml index e8dd1f476a..08f8450fa1 100644 --- a/.gitlab-ci.d/container-core.yml +++ b/.gitlab-ci.d/container-core.yml @@ -10,8 +10,3 @@ amd64-fedora-container: extends: .container_job_template variables: NAME: fedora - -amd64-debian10-container: - extends: .container_job_template - variables: - NAME: debian10 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index be34cbc7ba..96d2a3b58b 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -7,11 +7,6 @@ amd64-alpine-container: variables: NAME: alpine -amd64-debian11-container: - extends: .container_job_template - variables: - NAME: debian11 - amd64-debian-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a3174346da..270e99786e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -69,9 +69,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) -# Enforce dependencies for composite images -# we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian10 debian11 +# Special case cross-compiling x86_64 on non-x86_64 systems. ifeq ($(HOST_ARCH),x86_64) DOCKER_PARTIAL_IMAGES += debian-amd64-cross else @@ -89,10 +87,6 @@ endif # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= -# base images should not add a local user -docker-image-debian10: NOUSER=1 -docker-image-debian11: NOUSER=1 - # alpine has no adduser docker-image-alpine: NOUSER=1 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker deleted file mode 100644 index 03be923066..0000000000 --- a/tests/docker/dockerfiles/debian10.docker +++ /dev/null @@ -1,38 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target is builds on Debian cross compiler targets to build distro -# with a selection of cross compilers for building test binaries. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM docker.io/library/debian:buster-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - bc \ - build-essential \ - ca-certificates \ - ccache \ - clang \ - dbus \ - gdb-multiarch \ - gettext \ - git \ - libffi-dev \ - libncurses5-dev \ - ninja-build \ - pkg-config \ - psmisc \ - python3 \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - $(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) diff --git a/tests/docker/dockerfiles/debian11.docker b/tests/docker/dockerfiles/debian11.docker deleted file mode 100644 index febf884f8f..0000000000 --- a/tests/docker/dockerfiles/debian11.docker +++ /dev/null @@ -1,18 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target uses the current development version of Debian as -# a base for cross compilers for building test binaries. We won't -# attempt to build QEMU on it yet given it is still in development. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM docker.io/library/debian:bullseye-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata