From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663708448; cv=none; d=zohomail.com; s=zohoarc; b=PZDvUoDAHnoxfXjwbN4UkUK1Z4ZYbET3oqahOi98Tyncn0Wyeh1EfvhC/ZP8hLOS3Dlis2PzDpGr67l+5e+r44Q1DMk/Cj/ohew6pvNUQZYhjxmjxDw/rZvRA/+mjcKLhYerDICsbYOsXEcJ7fzFegDt7Qi9djpJj8LF0fV/Kk4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663708448; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Xn9EeJ1e0W9n/ww6L6+IOrL4d7Yg4BtDuGfce46InmQ=; b=QofZn2c923NL5Okj8dVm7T9zlxQdZiLjBk75+EM3OUbnB8mgyHWEiOS+mHRJx/SNBTM4FbLvfYPWEz1QLaJb4Cp3kGy4WOmjXBjiSWXg3WSuBmhdjP/VKsFplZlDqoqHMWc6TZzLIC3qw/cP2985qzwE5mcM8xnm7Lg1CbYyR+w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663708448089594.5266125408132; Tue, 20 Sep 2022 14:14:08 -0700 (PDT) Received: from localhost ([::1]:32926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakZB-0007EN-R2 for importer@patchew.org; Tue, 20 Sep 2022 17:14: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) 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) 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-Google-Smtp-Source: AMsMyM6Mi/Sd1uP/R4BOM0TcnPaZ60YDzhn2X+JTvF1MmDz3VI3S3hCOSDToxILMu3NYaJ8cuCr0qQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663708449506100001 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=C3=A9e 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=3D$PKG_CONFIG_PATH ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-system + --disable-system --target-list-exclude=3D"aarch64_be-linux-user + alpha-linux-user cris-linux-user m68k-linux-user microblazeel-li= nux-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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663708256; cv=none; d=zohomail.com; s=zohoarc; b=hsB2E8uwsdlHFgVSMv10HqiPuKqkaLvHZO4Fi2wpe7mfO5F7B4bSDVX2u6FS0I98erkVaLmEDs03lGGnsfdnnpkUWeD59jHqbfSu0Dprej/3Z5EmF4zwxU8Y7kGV2FDYvRGy/o69P12t1w5YmbygNddq/wa9Xu2JGhSi/tNX7oY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663708256; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9jZtMLEWUNRGMJhs1MyLKK4Uh8abbgf3TTaN/xU7wp4=; b=iobwJqb+cwHMDjoA7mvOnZHwds8mMa8f66brqnnhsn9oNfdb3V3rKI8klZkCZwyIe1QttCmKlqBU3RnJmzcvhWjlYvDa34YL9IPYGgKV+gw/5UhoivCWLhwhMKFLPQGMGWc1pqPoBKUv3IAvsyUia7No5w140AR5A5pSYzDUe7E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663708256640226.65669359326398; Tue, 20 Sep 2022 14:10:56 -0700 (PDT) Received: from localhost ([::1]:41878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakW7-0000qu-Ep for importer@patchew.org; Tue, 20 Sep 2022 17:10:55 -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) 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) 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-Google-Smtp-Source: AMsMyM7/8RbN6ZIfRZ3OyMAg/sCJ72cqBL3lOH7XKJK8excyLHXbuug/kRIPrLrVgIABxwNoKb8NmQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Thomas Huth , Alistair Francis , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663708259212100001 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=C3=A9e 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 =3D ('http://ports.ubuntu.com/ubuntu-ports/dists/' 'bionic-updates/main/installer-arm64/' - '20101020ubuntu543.15/images/') + '20101020ubuntu543.19/images/') kernel_url =3D images_url + 'netboot/ubuntu-installer/arm64/linux' - kernel_hash =3D '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50' + kernel_hash =3D 'e167757620640eb26de0972f578741924abb3a82' kernel_path =3D self.fetch_asset(kernel_url, asset_hash=3Dkernel_h= ash) =20 initrd_url =3D images_url + 'netboot/ubuntu-installer/arm64/initrd= .gz' - initrd_hash =3D 'd385d3e88d53e2004c5d43cbe668b458a094f772' + initrd_hash =3D 'cab5cb3fcefca8408aa5aae57f24574bfce8bdb9' initrd_path =3D self.fetch_asset(initrd_url, asset_hash=3Dinitrd_h= ash) =20 self.vm.set_console() --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663710777; cv=none; d=zohomail.com; s=zohoarc; b=kwvt97pStBMdTmI1BQVdrCrTZ1EBDZPOIfF6try6++e+a9dUPPuW2bFpdj/Kz1zsNKNU7T7gmsCoG/15DKgx8YW1su5/IdQ8kEVIQVhwuWCFPU9JvWIhwQAS9q/D16h04eLkHTvXVAKCDiQF5lTE/sKxfXVW2+g/7jbnroXLYk0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663710777; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=N17HHU9yrrmBbTr01LSTUzVVxN6Q3/Gwl12Sohrp4oE=; b=kL+wxdrQtymrMBMrtum8KQ/JmObWrblAPXWLL4KNNl3e4OOaEGpRrEbFyNxE6A1g/ZIhD1aSXDo8ern3l59shVLwkFFnGYSOtG/V4xeqGt5tgAc5A4zeMQN6k6INmwudvweEWwrCY20x1Q2fFo1E9H7H6idxHwsi8GdI95xnAY8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663710777891441.7006302512458; Tue, 20 Sep 2022 14:52:57 -0700 (PDT) Received: from localhost ([::1]:52402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalAm-0003Co-KH for importer@patchew.org; Tue, 20 Sep 2022 17:52:56 -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) 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) 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-Google-Smtp-Source: AMsMyM6HkmpP8n1FE1JXoqj7D0DiQmulRsZzRskYtonggJGuj/tAAElNDnCFlF3VQtbJqVxnKPfaVg== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663710778210100001 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=C3=A9e 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=3Dmachine:virt :avocado: tags=3Dmachine:gic-version=3D2 """ + timeout =3D 240 =20 def add_common_args(self): self.vm.add_args('-bios', --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663710989; cv=none; d=zohomail.com; s=zohoarc; b=PRtpGRNglAOOO/zqrghm/VfOCpO9dlu3LepesWZymA66frH49Xh7VPz3RNfM708JJAgWLEWPG20FQ3yb8fR1LV+7VnmAe1Vc40pDVY+uaUqLRsqYp2i6CEvlUO0lwYLCtCDnFMpKwSWAfVXcSwtRaQlO67yJeB/qrzjM8JrgDag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663710989; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wjsUAAComu1E7rFx1ESKMnJu2Ixm3maECOUpSPdRd/Q=; b=aDn4hTCWD64LmF3JyNyHoqqnK7pCKCFK/nwgTSv550eX05BsonxtuGeOXpOP+4XzdZXpzRipO3DXDYCBa6l7WY+Et2srKjy9dR77nTbclPtuu6WIsSRw+RMaZwdGzWBuGWVHtBXZ+7ZlIrE4efzXxSrfPXH+CSxkhOf5tVUyJQM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166371098995685.79977720739817; Tue, 20 Sep 2022 14:56:29 -0700 (PDT) Received: from localhost ([::1]:49508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalEB-0000G8-SG for importer@patchew.org; Tue, 20 Sep 2022 17:56:27 -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) 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) 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-Google-Smtp-Source: AMsMyM4m4deO7FVe2xSTmM/3wkjs9D2rAQj5L4PMSD1d7GW/C6rjQ/aQbrBwrwYOmGFBPqtNRwCang== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663710991149100001 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=C3=A9e 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=3Darch:s390x """ =20 + timeout =3D 240 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_s390_ccw_virtio_tcg(self): """ --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663710641; cv=none; d=zohomail.com; s=zohoarc; b=n8NnMyevynoGQKmEO3GoBgf91U+sjvwo2mZaNT+FPx/A75PHt+KTmb9Zo4HqaBDFwsCWiUJ45FFqBXZjieXzHF0MeX+hsZSdP8uIkstQTgwOd+Ey+f4rfnSPjOPHt+eZtAvGdrYncmDpAwJ22MXFC/z86RUI0IMvsoHCUtF1KAU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663710641; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ntf0o1o0k0Fp9R/q3eJsmYoFAtSQvEDfr5nhtPjCG70=; b=AiO/djO3MieRaSAVJrSKY5gtOiAZkxFFzoJXm1cYk+Qb0cOZUbsPVZEHyMhWmb4erLu1wEEjVJUnMTnxy8al54Hdi2iWzOdAiNF1sjzzmpE2TC4gw9x+5ulzxXQOl71J+JYZ+WiaAUka62pSZabuUpCY/KuRMpRd6gVmosa5IvQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663710641301910.5391556321996; Tue, 20 Sep 2022 14:50:41 -0700 (PDT) Received: from localhost ([::1]:54922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal8Z-0005ko-Vx for importer@patchew.org; Tue, 20 Sep 2022 17:50:40 -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) 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) 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-Google-Smtp-Source: AMsMyM5BEwDEKB51AVFlryY31gStD1xNqu8DSd6vqzmSp0ntOw1WSlAc3HKYih8zZ+BvLts4TguLiQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::634; envelope-from=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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663710643191100001 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=C3=A9e 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=3Darch:ppc64 """ =20 + timeout =3D 180 + def test_pseries_tcg(self): """ :avocado: tags=3Dmachine:pseries --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663710792; cv=none; d=zohomail.com; s=zohoarc; b=MzWhcG/4GluIyP/HZ5q7YYLAH/zcr6WogytG88SF+83xcpcm9tXTxcecqL1cfia0bxtBH756ZDY+sktCOct6bJ+ENEn8zjxAwfnj+HeZ7v4+g8ze1VtazjFM+63XLDOArD1UWu9ViOU8VDrfvPGsgSk/XAWfSa0j+5+umX+uYik= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663710792; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U3PlFQUpVUZuVdYiZMbaG1H1/BKHYNeI1k/uhxlCRws=; b=TDYYDVYt6w1AmOgWQngSIfb3VXEqmQ+F9bVp9KQwPF9UHF4/gV8QIUfo2s4wA2W7TiNzby2lBcdU2/6axwsgTqGRMdRyZcJ91H8HiYFJhX8svclLAPfQeUOcz4FvEcAimrgJ9CB9tmMZDMYvkRlPzBextfZUsB8wL8YyVKgklnQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663710792591935.8773934163781; Tue, 20 Sep 2022 14:53:12 -0700 (PDT) Received: from localhost ([::1]:58908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalAz-0003JF-Hc for importer@patchew.org; Tue, 20 Sep 2022 17:53:11 -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) 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) 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-Google-Smtp-Source: AMsMyM7Fh0LQqW4Cp2Ses5sL+TmrJr6kx/NTmkbZtrvR8rL3+hCl+R02SyNZEaQKUOIJD0vTFvre/w== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Richard Henderson , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663710794230100001 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=C3=A9e 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. =20 import time +import os =20 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 =20 =20 class AST1030Machine(QemuSystemTest): @@ -176,6 +178,20 @@ def test_arm_ast2600_evb_builroot(self): self.do_test_arm_aspeed_buidroot_poweroff() =20 =20 +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 =3D 240 + + def wait_for_console_pattern(self, success_message, vm=3DNone): + wait_for_console_pattern(self, success_message, + failure_message=3D'Kernel panic - not syn= cing', + vm=3Dvm) + def do_test_arm_aspeed_sdk_start(self, image, cpu_id): self.vm.set_console() self.vm.add_args('-drive', 'file=3D' + image + ',if=3Dmtd,format= =3Draw', @@ -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 ' + c= pu_id) =20 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2500_evb_sdk(self): """ :avocado: tags=3Darch: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:') =20 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2600_evb_sdk(self): """ :avocado: tags=3Darch:arm --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663710106; cv=none; d=zohomail.com; s=zohoarc; b=SPifdconiaK50Xh6KHPku1nYLBzKY1YYGgZdIWOAj71IRTCn2GXuevMhniMA38zIWupUjkyh8IG4Mz83g5ETDNfYSjpGWijD/7u9WoQx7gaFoPhm42NJzkZEWD+mDNZv7IvGmuaZxpiHbbKLLo0SUuauggP3YxL/iyFq1PuU3Mk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663710106; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HAk1owhoyeWDT/goQ0xeRgqf6zzLI7dtllkknf7bW9w=; b=eSXKjDzN9HWJrr8yZNNMvtzLA6RIT1jQZ9V6C4vwW8cWlata0n7D1xD4Xz0t7L1X+SSvkCN8K18eSnZwk6iavVSD1zWPfsk9RvnyH1+hOqKOPb1M6FRl0J+FbkWIuDMG3Cp3SwOm2PsKHxWrcJ6iUiutkFMNvS+5h39a+tp/9mg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663710106265596.2992749497663; Tue, 20 Sep 2022 14:41:46 -0700 (PDT) Received: from localhost ([::1]:44600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakzw-0006Fb-Nx for importer@patchew.org; Tue, 20 Sep 2022 17:41:44 -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) 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) 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-Google-Smtp-Source: AMsMyM5z21Qrzgk9oi3biHGZOXqk986mR2HR51EDUr5RTct5BSCJbrqL8zS8BkE+uVEYEBpL9msf5Q== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663710107193100001 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=C3=A9e 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): =20 # default timeout for all tests, can be overridden - timeout =3D 900 + timeout =3D 120 =20 def _get_unique_tag_val(self, tag_name): """ --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663711165; cv=none; d=zohomail.com; s=zohoarc; b=jW8g4EUn8BJ6AcZQ3tMf0upRmjJ/EvYW+j+zwJg2M8HNR7vg6e6tyikiXCck8dpm1ykVOLE1RsaZ3uUL11uXu97Vg/iFp99PFz4Os1lmD7M4ArqYIy7v4XDvHZBxzCUo0KcBhDpoqdMtRZMiCLD/7inAMfunsYuMXkPwMNovSvU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711165; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p614Yn9pYByJ8dTPq0j5fmlQHGdXVf6p9Jpw4u2AfOM=; b=n/XrOzzzXknFn86iLA4u2iXjUG7cNBj/R3oa5qcdG6n3aTujbVgjbSMG6BYlmYAQal7vI93s1iM0R5RmV8VYZSYjQZ+9d8r51ysGI+yxA0SzKwf4b8+AeaFvgj1SOo0kmF7qUiYi9iDZqsOFc9E8a/YNVjLB/KpXYGE5UKur7jM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663711165196344.4536805277979; Tue, 20 Sep 2022 14:59:25 -0700 (PDT) Received: from localhost ([::1]:36416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalH2-0007z8-0N for importer@patchew.org; Tue, 20 Sep 2022 17:59:24 -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) 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) 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-Google-Smtp-Source: AMsMyM6w03i150GfQvd8hKEMctOKIhGz4JjXPwrta4dzKW5UjskjfB8D+DVIrvqDuiWItvQt91nruQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663711166223100001 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=C3=A9e 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-cros= s.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 =20 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 +=3D debian-s390x-cross DOCKER_PARTIAL_IMAGES +=3D fedora endif =20 -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/doc= ker/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 =20 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663711427; cv=none; d=zohomail.com; s=zohoarc; b=ILwhH9oXLfbHLBUcfI6uceggQgHUciICviDjPykDt7O0D9BsxDl8F/PzJZXg0aGmFEtTzBuCbx8CMBEE2Z84zl/qEH/5iOktwY7ZNzxRAwdcYQ7SlYchsKCxSqrPboLQuaQ1hu8ZgwUN2EkHfeqoEdyug91FgOuJhxay8Pj2t0Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711427; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kgOtjYfIt+ylJV73NEowm0ceMrq4o4dFJuDidaHM5To=; b=DsJ91rTVejlO880QdxSqawC65mN9vCpK5wOsw/g9ATy8VXyfucSIHcv2mawg/lho7TDwFsg3BA1Ha3P2lynuRBGJ5gUSVoXDOBnLlD5cCjz+kR++OpFmeRwEsfK6XQcy0BJUGEFnPD9k1IDZM5Z85oT1ITHtjL+46BL5fvvN+4w= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663711427863750.840488705777; Tue, 20 Sep 2022 15:03:47 -0700 (PDT) Received: from localhost ([::1]:53478 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalLG-0005Zi-QH for importer@patchew.org; Tue, 20 Sep 2022 18:03:46 -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) 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) 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-Google-Smtp-Source: AMsMyM7GmSpr5h/JTJhYCrYWSxXzdyBGhUyL5no4EqDgzFD42IRrfyeYqz22ECnrSypY8zUGV+/rhQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663711429896100001 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=C3=A9e 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-cros= s.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 =20 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 +=3D debian-s390x-cross DOCKER_PARTIAL_IMAGES +=3D fedora endif =20 -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/dock= er/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 =20 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663710991; cv=none; d=zohomail.com; s=zohoarc; b=SBkqw1FeptNchiT6qHleYi5veNFL5NFh+R4oKNpMxurFMJbizlDDUJodv77gx5To47jB6PQKMIDPiXyDSgJZQg1xK+PbkVHMRmBPhL1m7buuqDqNO8C3z2sX1Q8JdLdbhdCiFUKSkU5yTH8chhLsFEYg/E8WHlEwtSZBgP2dCrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663710991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oHx+ujubQ51Z4+UiDF4O14qPW1hIAG2/bzHjOZXayMc=; b=R6lQXVIhCxCntWiX4ppqFpSDqHLkC6muE9eIEa6xY0U94d55ge+c8Ox/C2JummO4rTxXokD0M6gfejYyW4Fc7FNPeCi8wabFayLFetWmRD+RvbQJuQGf8RTT0GuqDmCjcHq4cNfTQyzLM6McUL+hbiU0ix8PXJQTgWmQLiIW8hM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663710991795721.1687997961636; Tue, 20 Sep 2022 14:56:31 -0700 (PDT) Received: from localhost ([::1]:54158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalEE-0000Si-IQ for importer@patchew.org; Tue, 20 Sep 2022 17:56:30 -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) 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) 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-Google-Smtp-Source: AMsMyM6Aqg1ovY2s8PIbOGxd35ZG1ejVbyD1kzla26vuecW+GAtGAjPLL/B1UmmeeBsKQ38gHjB0tg== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663710993120100003 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=C3=A9e 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-cros= s.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 =20 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 +=3D debian-s390x-cross DOCKER_PARTIAL_IMAGES +=3D fedora endif =20 -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/dock= er/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 =20 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663708671; cv=none; d=zohomail.com; s=zohoarc; b=UZ+43Ar/TmBYqOtwnMYMVg0+UMEOpHrj/YrGD7xXXaVcyI9L3pzVpblrT8VhmsipYDXHtw/1R2iXvNGHzKWO9Y2xc04X094qOFwMG2pk5tv+vsoChxJn/2WkKL+eZYZKwcjCZPNu8G48x/vDN0hSz3phNV6LQWluoisJ6Edw/hQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663708671; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pAX7EzPv2yIW/JjQbt45KialnMqV89oGUWLI/H7OpIY=; b=Y5DyremIBf/VzJK2oSONXnMPeJQ2qHc5WVHx90fAL7Xa47xi7I3sqPC+Dpj3/Ubrry2RR/JZ4qpG8BFj6Ac4Va5vDSTmO4XWNgun3QR+TJuLEA/APWNX8lOM9h2CWAjxeLWSNNkbzAiTem7L58txBMsx7PDCZmmlcoFzQgo1iSQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166370867188690.37115106696626; Tue, 20 Sep 2022 14:17:51 -0700 (PDT) Received: from localhost ([::1]:38370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakcm-0004tb-3s for importer@patchew.org; Tue, 20 Sep 2022 17:17:49 -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) 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) 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-Google-Smtp-Source: AMsMyM7Vmiv8Ux4Fyz9vmIbprvGwLAzQ/Ah72hy3v3RgnFeK6rqklCSNwTIlAuxRnyP3pxQeZMQMqQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663708672532100001 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=C3=A9e 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-cros= s.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 =20 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 +=3D fedora endif =20 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 =20 diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/do= cker/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 =20 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663709398; cv=none; d=zohomail.com; s=zohoarc; b=HqtyFzo8/MFhytDvO0mz/fjVK4QnNDfIhzNii4OTQe2qP/n53Rak6O4BQ3VFLRjxGigO4wjP/4tq2ShsFbXPJ9V+zWgY98kD+tnZB2cn2gncsFOmCkgFMPYYFTOGsHBWJL/XogimRJK5odLf5YmPAlsvD+cV2vnfAaVYa5DYaBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663709398; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FCp0ZhdcLPVYE2rXlJfbfkU6sxhsi+xnGbJPXBfntxo=; b=b6jhpzH6nHL61vaqNPyypUToVpuG4QCqVbEIo4+ax+7fF5Fbeh+a+7Wt0sFGGH1J0Sqe1AMB34WQhKftgqqRJkJ5SXV1A/SEcTo3vC6iW5GGyYAxmTiGsjPwBsVmMCgKNeSVx5WUYwjJcPxrdStjQl98uHsMg8RT17CjJeF19uQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663709398444549.5618795464452; Tue, 20 Sep 2022 14:29:58 -0700 (PDT) Received: from localhost ([::1]:40778 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakoX-0005NE-5w for importer@patchew.org; Tue, 20 Sep 2022 17:29:57 -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) 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) 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-Google-Smtp-Source: AMsMyM4gPWQ/q9A2YJ6osESQleDCwZHbMF9gIPXkKaTIaaVfP/zA5UyaIQhfajV1i5RxRGrxxHv2mQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663709399647100001 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=C3=A9e 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-cros= s.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 =20 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 +=3D fedora endif =20 docker-image-debian-mips-cross: docker-image-debian10 -docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 =20 # The native build should never use the registry diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docke= r/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 =20 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663710497; cv=none; d=zohomail.com; s=zohoarc; b=m+Cnn00nE5VEBDs+GAL/4p760kPyi6iMzp3/bVHbqrl7a97FgXtCSQscnVUgtBIqz7aaqa5iZULxk0q7/yqwVMsANE+wWjOL63KAhPAOqTBJOCe2pslg4/hVtbhNJ3yUDmH/mfWqHmCvuKWLiaoHDxmwXOfGFn7UopOc9QvNazg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663710497; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=lGP32FeNcGkLN1t0VFLZXvScNyvJq9qr7BUy9LY4/aQ=; b=IH7bO8DmRVGKSvAaYAtfvFY7nbSRFwCPuGNmWGyRT3iI38MOypQvcyrVeERp5ESBzRG3tlzpFdjSBAMbydqtO8fDGK0xg1TLEGDQN0dh7XROMbc/Hp6tqH9r7xaEyQ11job6HHdL9XAbb4X8AuxwT8a1jrbVNtGs+cdZl13wgnc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663710497063340.4898989690404; Tue, 20 Sep 2022 14:48:17 -0700 (PDT) Received: from localhost ([::1]:44486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal6F-0001jW-RJ for importer@patchew.org; Tue, 20 Sep 2022 17:48:15 -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) 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) 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-Google-Smtp-Source: AMsMyM5VheRKmEnKy0rXFvgIll2MC3RUcQZ+x2Ki8UiLecJdUakXU6FIfixtpY3kxUx+eTmF5KCSeg== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663710498255100001 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=C3=A9e 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-cros= s.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 =20 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 +=3D fedora endif =20 docker-image-debian-mips-cross: docker-image-debian10 -docker-image-debian-sparc64-cross: docker-image-debian10 =20 # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY=3D diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/d= ocker/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 =20 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663714741; cv=none; d=zohomail.com; s=zohoarc; b=FbqGLXmZ/xCzYfj5JGlr6wlH8jQzBFDdidxvpNiK6kk2ATqfLBkZX1zMsMHapHp9M4Cma/SEfRseQqfFY/E/lJwsqnzKujGXhl/enYYefLVlymxRIrKHXys+ONqcsNOu5zPbJqKKukXLE+QYIYBoJFJuO5njZ7zeWwSKrb2IrGE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663714741; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=iH6jIIlmVr3MkXQmYqy3OgPLmAu7CB0ASJoiLfWhauM=; b=iLrLUhtQobEbF5qixkjzawtDcRH6v2gtA5EgtS84br9izcK4uPTd4fI4yqaru9/JUjU3L0YnmYLx/bU+ZQZPzJWR1RTxl/TauvEGbV2i+aGCJn+ks+CXUvdJYMO+JirIkdTINKy19RHNA0o9burtTu4fIGKQNoFwl9lXOVNMaGw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663714741656858.5645557579439; Tue, 20 Sep 2022 15:59:01 -0700 (PDT) Received: from localhost ([::1]:52614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oamCh-0001Vx-FV for importer@patchew.org; Tue, 20 Sep 2022 18:58:59 -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) 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) 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-Google-Smtp-Source: AMsMyM7HLMU77avKf2M0lBImQ54btWwQDSEXRfSU5lF2cWZNF9REm030maps+Nhz4dmdS9XsRVHuFg== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663714742532100001 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=C3=A9e 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-cros= s.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 =20 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-debian= 10 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 =20 # These images may be good enough for building tests but not for test buil= ds diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/te= sts/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 =20 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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 \ --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663711324; cv=none; d=zohomail.com; s=zohoarc; b=OYS1SCZLAK2Pg/+xaf7he3TxT/4dTohFnDanVkcOHkATNksjpLLj8vW5o7XQj6EMWKpj6/ecKZ4krLjNRiV+rB2Nw/sJHEaqWQpMWfywf9vuNxxxQ5eZ2GgI83tEqvTGIgcM3e5g7XgWhU4JdI02+MD/CovFM9ocgg/gMVAYnYc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711324; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=86511PSfGdIpDAhzbaIAt+hVhHMNAndvtnlB7exVR9w=; b=JJ77hwrFTF9588ppBfJxv59WgdGRikQpXulFP/2Q6NgvHQgJO+K03xxm2tdJJ4RqxV+o/i8qZMx3afVkbYtBFwSJk4y1VJJHE/Xme/AbnXAWJg2bPBYp6xx5sgpw/7pD1XoV25YhQsulpJkJA2fPFJWP8g5/c+WpFLi25rGULEU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663711324715434.2307922816285; Tue, 20 Sep 2022 15:02:04 -0700 (PDT) Received: from localhost ([::1]:54870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalJa-0003tO-FP for importer@patchew.org; Tue, 20 Sep 2022 18:02:02 -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) 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) 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-Google-Smtp-Source: AMsMyM6sMk/jviBHxIi6OW6qOAX9yRlxUHd3xe/zaUZ2pRL6jdqntapQQKQUMfzWPIl+92B920LIFw== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663711325476100001 We missed removing this dependency when we flattened the build. Fixes: 39ce923732 (gitlab: enable a very minimal build with the tricore con= tainer) Signed-off-by: Alex Benn=C3=A9e 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-cros= s.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 =20 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)/de= bian-toolchain.docker \ $(call debian-toolchain, $@) =20 # 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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663712119; cv=none; d=zohomail.com; s=zohoarc; b=FN5EIRax3W5vj+VKrgGlqkSHl7LEXkCg024xy0PEZHIFRWguavqC5Ac/btrTAjALvaveoUiT2cViun5uFQEXgMLe/4Mzzlp+0obU5ntBs/jtclGMNChRH32jZPn2Og8AxbQsjGPUK5+mPok8b9Ae7Oj4fxz0dVLbaAMbbm9Xdfc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663712119; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8ZUKtzGk7WPnEFS3PMm7d4pu0BGAkLQhtgRChbWSZVU=; b=KMG8F4UDOaLbSgRfFf9NPcCLAC9Y6ZEmF7+xVXTJDOuHHRAQkaQ0WeTj2R1gfvTjNpJfmdxRBsAVicd7q/yH1+vLAt4jgXVyhnnBCzBmQUiuJ7h567HxM2E/BzHSdPOZypqArpDC9HTB9Gkx65tk+Pnw0o1oIZIcogRPZkGl50o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663712119874679.8270847438408; Tue, 20 Sep 2022 15:15:19 -0700 (PDT) Received: from localhost ([::1]:57750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalWQ-0007CG-EY for importer@patchew.org; Tue, 20 Sep 2022 18:15:18 -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) 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) 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-Google-Smtp-Source: AMsMyM5/XoFZVkuynMVZKs7Zgju4bgPsdeizv81m1Ma/2sDNhhWtdmalUTZSYhNsLDHB1POEPbHR5A== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663712121077100001 We missed removing this dependency when we flattened the build. Fixes 9e19fd7d4a (tests/docker: update debian-amd64 with lcitool) Signed-off-by: Alex Benn=C3=A9e 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 :=3D debian10 debian11 ifeq ($(HOST_ARCH),x86_64) -docker-image-debian-amd64: docker-image-debian10 DOCKER_PARTIAL_IMAGES +=3D debian-amd64-cross else docker-image-debian-amd64-cross: docker-image-debian10 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663710306; cv=none; d=zohomail.com; s=zohoarc; b=TwtYCiNUGXoYCOeUsKDlfI4BsLalv1I2WhkOSIEdSrtofpA+tF0T+0j7lfOrvgnJQot94yjmJ8egkwFa5nfmB1ytm326dDxSWk5cOiF4kXhjd1NgJxwMVGVbvUBvIidJVoLMHpESy+iG9Y/biGHqmag1doYz8URsIKHvjgYcicM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663710306; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jjWgH7l+7GgsF+R/Vmkn7IGDdCuZsyafwDXHCQ+NIKQ=; b=T58Hsh37Wh1vQsgvvbBQHxPLXUtiQPZwwlKt8PBaIfSyEU0hbpGS4KHMcZOH+/gf6qbV9PziT0FSZDBQXLY6vkMCeDwDQPqXv2Wvcxk1EJWFGGSIT/1vSj2RypgUcruBvK8Wrm/hSX6uy6uiaEIFUT+LfI1+L7n7M2OHdAKuoFA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663710306600140.18972886630934; Tue, 20 Sep 2022 14:45:06 -0700 (PDT) Received: from localhost ([::1]:46716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal3A-0004GE-8z for importer@patchew.org; Tue, 20 Sep 2022 17:45:04 -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) 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) 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-Google-Smtp-Source: AMsMyM54xHaBtUQp9e0yU2M4ijuOtDGdf1CVceRjB0Se36M5R2II4gf/9rC6CV5z0F9q9pzu7joBJg== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663710307261100001 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=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 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 =20 EFI_AARCH64 =3D $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) =20 -X86_IMAGES :=3D freebsd netbsd openbsd fedora haiku.x86_64 +X86_IMAGES :=3D freebsd netbsd openbsd haiku.x86_64 ifneq ($(GENISOIMAGE),) X86_IMAGES +=3D 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 =3D "fedora" - arch =3D "x86_64" - - base =3D "https://archives.fedoraproject.org/pub/archive/fedora/linux/= releases/30/" - link =3D base + "Server/x86_64/iso/Fedora-Server-netinst-x86_64-30-1.2= .iso" - repo =3D base + "Server/x86_64/os/" - full =3D base + "Everything/x86_64/os/" - csum =3D "5e4eac4566d8c572bfb3bcf54b7d6c82006ec3c6c882a2c9235c6d3494d7= b100" - size =3D "20G" - pkgs =3D [ - # 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 =3D """ - 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=3Dpython3 {configure_opts}; - gmake --output-sync -j{jobs} {target} {verbose}; - """ - - def build_image(self, img): - self.print_step("Downloading install iso") - cimg =3D self._download_with_cache(self.link, sha256sum=3Dself.csu= m) - img_tmp =3D img + ".tmp" - iso =3D 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 =3D [ - "-machine", "graphics=3Doff", - "-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=3DttyS0") - proxy =3D os.environ.get("http_proxy") - if not proxy is None: - self.console_send(" proxy=3D%s" % proxy) - self.console_send(" inst.proxy=3D%s" % proxy) - self.console_send(" inst.repo=3D%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 =3D self.console_wait("3) [x] Installation", - "3) [!] Installation") - self.console_send("r\n") - if good: - break - time.sleep(10) - - while True: - good =3D 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 =3D " ~]$" - self.console_ssh_init(prompt, self._config["guest_user"], - self._config["guest_pass"]) - self.console_wait_send(prompt, "exit\n") - - # setup root user - prompt =3D " ~]#" - 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=3D=3D\"vdb\" MODE=3D\"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=3D%s' >> /etc/yum.repos.d/qemu.= repo\n" % self.full) - self.ssh_root_check("echo 'gpgcheck=3D0' >> /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__ =3D=3D "__main__": - sys.exit(basevm.main(FedoraVM)) --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663712324; cv=none; d=zohomail.com; s=zohoarc; b=hhDuD7HrYJ8GwVxDZRYNFEaN/9CzdDVKZxWO6xzTZEcFYkeKriM0wncQhwIjMTchWst+qItuqHGuDO83iS5XyMrERFr3uMGY4/NCTP7kA30FUSoD7ceZ2fxeiJPnqYXbKD19b0HdmYISy1tO8EQWjuTfrUnK+FXDnjsz662nMNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663712324; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SwsloABj9l4c1j5XqayskjiIM16mHr6hEPOnkBWi5uQ=; b=SVnPgh0Og9PRTZjz3pJiAVYIjiTb60kQWoutGj2m4Zp+ejx6LoKbjC78ee2Pba0bW0GiHmhb4xY8CRdL4LzoSw/U8Q8bgXAr1bCOB6dxeVXafyG+1aiVUyZ1fkk09bFuFqqUBELOi/QV2HN+3vKXuEHcrT57VBEEx6kW4EHNQyU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663712324574724.7294334543626; Tue, 20 Sep 2022 15:18:44 -0700 (PDT) Received: from localhost ([::1]:54944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalZg-0002KZ-Dh for importer@patchew.org; Tue, 20 Sep 2022 18:18:41 -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) 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) 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-Google-Smtp-Source: AMsMyM5cd2YoiWl8UMjtfi6Cfb/rLMlSHx+vxdB5IBkZgs7CR19p4H0Uf0oeEFIkMWk9z4iyEEQEPA== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663712326431100001 This is working around current limitation of Meson's handling of --disable-pie. Signed-off-by: Alex Benn=C3=A9e 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" =3D "no"; then if compile_prog "-Werror -fno-pie" "-no-pie"; then CONFIGURE_CFLAGS=3D"-fno-pie $CONFIGURE_CFLAGS" CONFIGURE_LDFLAGS=3D"-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=3D"-fno-pie -no-pie $QEMU_CFLAGS" fi elif compile_prog "-Werror -fPIE -DPIE" "-pie"; then CONFIGURE_CFLAGS=3D"-fPIE -DPIE $CONFIGURE_CFLAGS" --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663711695; cv=none; d=zohomail.com; s=zohoarc; b=HPz8JkOfpYKTjN6s12VGeNOlDIHIzSvrY8Dbj9vJafpb7y/yhOV2/S7wEAbyT37ArYkjWlDaEgvM2dst49Nska8qmPIJX1+lv7jnfOslWiZARD+lyD/Hb9XgWSNQVZnqj6lHXiOZ7kPimuTqXJrgnsrkuPlDt9ChsmFXMPUDCUg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711695; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=N5I2F6uV15K8rJ+JfIBb+LUKr5djlIcn2XXO4PUTzSQ=; b=UQ+9ask+pzFg67stmCxUijLoKdcBSXN1R7ARJ0puOOiNvIMkgcZO89ygpu5MKicZibGB5gByJ5/ZvjrJxWnhqEQtTlvPNOPTSo4EEoUIMigqAKVc4sRVQgyqZj4uIGK9uFhVS4JscEyUWEcphfXlNdEyl+pmiPH3Wy07peLzJ+U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663711695078477.61753745877945; Tue, 20 Sep 2022 15:08:15 -0700 (PDT) Received: from localhost ([::1]:53016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalPY-0003Mo-O0 for importer@patchew.org; Tue, 20 Sep 2022 18:08:12 -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) 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) 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-Google-Smtp-Source: AMsMyM5aRuEYHAZYhB4CtIVKVQSqYrn7yJq4lhAsRbAd4oco/o7qIndlXUutVG1Ojt8kCkvvEFrApg== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663711696178100001 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_f= irst': (.text+0x10): relocation truncated to fit: R_AARCH64_LD64_GOTPAGE_LO15 agai= nst \ symbol `__environ' defined in .bss section in /usr/aarch64-linux-gnu/lib/li= bc.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=C3=A9e 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 thos= e libs in distro supplied packages - mkdir build - cd build - - ../configure --enable-debug --static --disable-system --disable-gluster= fs --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-gluster= fs --disable-libssh --disable-pie || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663712585; cv=none; d=zohomail.com; s=zohoarc; b=AAWi/6mT336wYpf05+QJLw2c9vZtp/yDkMuz80lEcT90cClVQ0FtSoEqOTBsC+wL0z3pwQQcq7XnEFC4+0NF/i2aJnMPst0bNsYZ1Q/XY/UIAYfrQt9Ik0plwETD1vtneul8LjBAFPXp+BjYpZSzsepqMXXqjkRQfKi+F4WC0Ek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663712585; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3o2V5qY3va6oi4DyilHks2k3IlXaipM0Pd6rZp5g9VI=; b=S54JoxP8hKajt5eqdAVck9SiNB+X9HbuLTRNYLtEd7pKAYw5qBTl5bisaU8MuM7TSh78cRbT0OiAjQywd+zUqfnLKFkVxkMaz2ArW+HW6CNHEZtk+GSXFS+NJIXkw0SOKuAofhwsKW6OP8PcxwahehLZ23nQV+wf6jXsugzg7EU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663712585803757.0677263792593; Tue, 20 Sep 2022 15:23:05 -0700 (PDT) Received: from localhost ([::1]:57416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaldw-0003Ld-Nk for importer@patchew.org; Tue, 20 Sep 2022 18:23:04 -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) 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) 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-Google-Smtp-Source: AMsMyM61IzQCjkrS5739uFQwz2yQQCPtiEKHJ0Lx1/DsCmUQaroBz4cFh4zRIG2caSP1VyCs+ej/Qg== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663712586117100001 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=C3=A9e 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: =20 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" =20 -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 =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^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" =20 -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 =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^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 thos= e 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-gluster= fs --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=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 @@ -26,11 +24,11 @@ ubuntu-20.04-aarch64-all-linux-static: - make --output-sync -j`nproc --ignore=3D40` check-tcg V=3D1 || { cat meson-logs/testlog.txt; exit 1; } ; =20 -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 =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^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=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 || { cat meson-logs/testlog.txt; exit 1; } ; =20 -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 =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^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=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 || { cat meson-logs/testlog.txt; exit 1; } ; =20 -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 =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^staging/' @@ -89,11 +87,11 @@ ubuntu-20.04-aarch64-clang: - make --output-sync -j`nproc --ignore=3D40` check V=3D1 || { cat meson-logs/testlog.txt; exit 1; } ; =20 -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 =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^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=3D40` =20 -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 =3D=3D "qemu-project" && $CI_COMMIT_BRANCH = =3D~ /^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=3D40` - make --output-sync -j`nproc --ignore=3D40` check V=3D1 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=C3=A9e M: Philippe Mathieu-Daud=C3=A9 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 =20 Documentation ------------- --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663694718; cv=none; d=zohomail.com; s=zohoarc; b=S0noBmHSJhQNkSw3XoF5hdxAVqQi7RsifV7SbHUC7xBIJl08A5xJss0cT/gTycZchhGnRWcrTWM4z5CmjT32oOG0gKmmY496+pdyEHPlXMq32ZQIJAa3xJHw5yceBlHKQcnAc3Sl8pvw6h2Ze366umFAZATHAbxXtNAujvkdsiY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663694718; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=aqXnnX8jlTZ0XZtDvIycK9gnBUppEqoHxatpad3BDw0=; b=ZUtHGQby6lHcPSvaQTMlDMo05Hn6b7hppedqnu0psQkmOVMzJmVlwbKh+vJOoBnJSmBVe2+NLrIrrMe11wvJKD2RE+6GDT+/cSHjg3hjJgCBGrWsiKKuwhusniNnaSu6D/PJ6l8AIQ0T73BkJ45CDQRZyg3W9n6z+EiVCdudK/Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1663694718178560.0707237825931; Tue, 20 Sep 2022 10:25:18 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-491-jm712YGIPt6gHrukbqQycw-1; Tue, 20 Sep 2022 13:25:13 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 112F23C01D80; Tue, 20 Sep 2022 17:25:11 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8266A2166B29; Tue, 20 Sep 2022 17:25:09 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3B12C1946589; Tue, 20 Sep 2022 17:25:09 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 185941946588 for ; Tue, 20 Sep 2022 17:25:08 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 02B4440C6EC3; Tue, 20 Sep 2022 17:25:08 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id EEB9240C6EC5 for ; Tue, 20 Sep 2022 17:25:07 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D3822862FE2 for ; Tue, 20 Sep 2022 17:25:07 +0000 (UTC) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-282-IbxHnomLNyCKm4VZV6qA3Q-2; Tue, 20 Sep 2022 13:25:06 -0400 Received: by mail-ej1-f51.google.com with SMTP id r18so7805135eja.11 for ; Tue, 20 Sep 2022 10:25:06 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id w8-20020a1709067c8800b007815ca7ae57sm120985ejo.212.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 E59781FFCC; Tue, 20 Sep 2022 18:15:35 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663694717; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=aqXnnX8jlTZ0XZtDvIycK9gnBUppEqoHxatpad3BDw0=; b=SY1x5R/8suowY6ImINgve58iHVycFGSPP2eGlY3j46GVuRmOvUveCJ+/9AP8MAxKbQewUG h/QHJA4u7Bl8M6uLhERmno7xGsvbHTw5rQqEcDDJDHveUIThNhdTy9xdFtTc8pM+CQ2s77 vefR8RCkGqQq9+exqp/TUH/YTaJaIvo= X-MC-Unique: jm712YGIPt6gHrukbqQycw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: IbxHnomLNyCKm4VZV6qA3Q-2 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=aqXnnX8jlTZ0XZtDvIycK9gnBUppEqoHxatpad3BDw0=; b=undB8kwMHiUmp76fpAcGBrhLok5o+o2PT+wVMwvgoKObVUZiR0nywnF7xF0izk7jth WTmtYKUjzRsXOnkvBcEy/KCwRW+9gcKcwrraED+QhbXKzYaKsJhWCMBMK+PPyLdevZv0 aF54baPLeq5wnzD4qCTMpiPmgjX5bY0nOuPiRP4DFljpkxmYZzAcijTqOomzKAaqiHTJ MFwvGRwnbtPhJbLMdJtX083JGUivEPS0hmTAxpbWsJBXTQ4r+A3aVb4BgfeEpoZ5RVZ2 PP6SGoxSYHsMfXMoyDKoKtgMi8Zzdkt7i5ntlsc9s1Clmfvy3R0fJz9U2zhh6Amq2imy fIzw== X-Gm-Message-State: ACrzQf2B2pLVhbMwA3+IR36ugYtSfg6Z973uonPbq90QjuQxGD+ysmTr NNQW7k9Akw1jbXvJKqvJ3Gre5w== X-Google-Smtp-Source: AMsMyM7EGOcw/iwABkQjJbhK91g29+DxdnhdBLmQ2hcTV6rlX6K0NhOyIdSeNchaJuqYuY9tFd+QSQ== X-Received: by 2002:a17:907:7f18:b0:780:7a0a:110c with SMTP id qf24-20020a1709077f1800b007807a0a110cmr17753295ejc.446.1663694705730; Tue, 20 Sep 2022 10:25:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PULL 21/30] Deprecate 32 bit big-endian MIPS Date: Tue, 20 Sep 2022 18:15:24 +0100 Message-Id: <20220920171533.1098094-22-alex.bennee@linaro.org> In-Reply-To: <20220920171533.1098094-1-alex.bennee@linaro.org> References: <20220920171533.1098094-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Beraldo Leal , "reviewer:Incompatible changes" , Huacai Chen , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , Jiaxun Yang , stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1663694719812100001 It's becoming harder to maintain a cross-compiler to test this host architecture as the old stable Debian 10 ("Buster") moved into LTS which supports fewer architectures. For now: - mark it's deprecation in the docs - downgrade the containers to build TCG tests only - drop the cross builds from our CI Users with an appropriate toolchain and user-space can still take their chances building it. Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Huacai Chen Reviewed-by: Richard Henderson Message-Id: <20220914155950.804707-22-alex.bennee@linaro.org> diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index a2fee53248..1c1e7b9e11 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -41,7 +41,7 @@ Those hosts are officially supported, with various accele= rators: - Accelerators * - Arm - kvm (64 bit only), tcg, xen - * - MIPS + * - MIPS (little endian only) - kvm, tcg * - PPC - kvm, tcg diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index c75a25daad..0d1fd4469b 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -213,6 +213,19 @@ MIPS ``Trap-and-Emul`` KVM support (since 6.0) The MIPS ``Trap-and-Emul`` KVM host and guest support has been removed from Linux upstream kernel, declare it deprecated. =20 +Host Architectures +------------------ + +BE MIPS (since 7.2) +''''''''''''''''''' + +As Debian 10 ("Buster") moved into LTS the big endian 32 bit version of +MIPS moved out of support making it hard to maintain our +cross-compilation CI tests of the architecture. As we no longer have +CI coverage support may bitrot away before the deprecation process +completes. The little endian variants of MIPS (both 32 and 64 bit) are +still a supported host architecture. + QEMU API (QAPI) events ---------------------- =20 diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cros= s.yml index 611c6c0b39..95d57e1c5d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -89,7 +89,6 @@ mips64el-debian-cross-container: mips-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-mips-cross =20 diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 4a5fb6ea2a..c4cd96433d 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -70,20 +70,6 @@ cross-i386-tci: EXTRA_CONFIGURE_OPTS: --target-list=3Di386-softmmu,i386-linux-user,aar= ch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user MAKE_CHECK_ARGS: check check-tcg =20 -cross-mips-system: - extends: .cross_system_build_job - needs: - job: mips-debian-cross-container - variables: - IMAGE: debian-mips-cross - -cross-mips-user: - extends: .cross_user_build_job - needs: - job: mips-debian-cross-container - variables: - IMAGE: debian-mips-cross - cross-mipsel-system: extends: .cross_system_build_job needs: diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c3375f89c5..b1bf56434f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -81,14 +81,12 @@ endif =20 # For non-x86 hosts not all cross-compilers have been packaged ifneq ($(HOST_ARCH),x86_64) -DOCKER_PARTIAL_IMAGES +=3D debian-mips-cross debian-mipsel-cross debian-mi= ps64el-cross +DOCKER_PARTIAL_IMAGES +=3D debian-mipsel-cross debian-mips64el-cross DOCKER_PARTIAL_IMAGES +=3D debian-ppc64el-cross DOCKER_PARTIAL_IMAGES +=3D debian-s390x-cross DOCKER_PARTIAL_IMAGES +=3D fedora endif =20 -docker-image-debian-mips-cross: docker-image-debian10 - # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY=3D =20 @@ -144,6 +142,7 @@ DOCKER_PARTIAL_IMAGES +=3D debian-hppa-cross DOCKER_PARTIAL_IMAGES +=3D debian-loongarch-cross DOCKER_PARTIAL_IMAGES +=3D debian-m68k-cross debian-mips64-cross DOCKER_PARTIAL_IMAGES +=3D debian-microblaze-cross +DOCKER_PARTIAL_IMAGES +=3D debian-mips-cross DOCKER_PARTIAL_IMAGES +=3D debian-nios2-cross DOCKER_PARTIAL_IMAGES +=3D debian-riscv64-test-cross DOCKER_PARTIAL_IMAGES +=3D debian-sh4-cross debian-sparc64-cross diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/dock= er/dockerfiles/debian-mips-cross.docker index 26c154014d..7b55f0f3b2 100644 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ b/tests/docker/dockerfiles/debian-mips-cross.docker @@ -1,32 +1,14 @@ # # Docker mips 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 - -MAINTAINER Philippe Mathieu-Daud=C3=A9 - -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture mips -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ - gcc-mips-linux-gnu - -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt build-dep -yy -a mips --arch-only qemu - -# Specify the cross prefix for this image (see tests/docker/common.rc) -ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dmips-linux-gnu- -ENV DEF_TARGET_LIST mips-softmmu,mipsel-linux-user - -# Install extra libraries to increase code coverage -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ - libbz2-dev:mips \ - liblzo2-dev:mips \ - librdmacm-dev:mips \ - libsnappy-dev:mips +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + gcc-mips-linux-gnu \ + libc6-dev-mips-cross --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663708892; cv=none; d=zohomail.com; s=zohoarc; b=ShJNYfSrffehGT66MWjDcHfWgQ5oUfRFbeNfVRbSfMSj8zmI7or0SAPzWcK7B/nVBMipmPBwsV/R3uuLnR6i8SGYGJpb7QCtzzFbtggILTOe/8SHmNd+S91MU0Gw0TY+1wtP3PQ5TLo0hA2Q3fjH0pi9x3oxZ0NBTQHrQG5vZ1M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663708892; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EyXiClvBgcxNkia9TfTVEvuirS+K1EwYfQ6G+A3OABc=; b=W7I2grfwht1rGV56NMuXL0MuBsmxMyi8oQtFRWQkWMKA7mn9+dqJ6iSbrQf+fAIaYcRhZlOwFzg/uoNtx2333P2sbokH6kDzWa/58oqPX2oCM3J0i2j4swm9v6Fh/NGRYIGTZhQnJWHvLzZYibG+Pn8C1wVSi1DsL4zY6abFDW4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663708892967199.46923638747728; Tue, 20 Sep 2022 14:21:32 -0700 (PDT) Received: from localhost ([::1]:38824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakgM-00023q-Hk for importer@patchew.org; Tue, 20 Sep 2022 17:21:30 -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) 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) 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-Google-Smtp-Source: AMsMyM7hO9XWnGTy35hvu8gDWm5KoPx3WXovZuIt9lpVWJ4fsmG+cw9wzFGwWaB5Xe+SCngWhaTRqQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663708893966100001 Flatten into a single dockerfile and update to match the rest of the test cross compile dockerfiles. Signed-off-by: Alex Benn=C3=A9e 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-cros= s.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 =20 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-debian= 10 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 =20 # These images may be good enough for building tests but not for test buil= ds DOCKER_PARTIAL_IMAGES +=3D debian-alpha-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/te= sts/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 =20 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663713341; cv=none; d=zohomail.com; s=zohoarc; b=lICFgUHU4otqiy1oQGImntU6fyNWyLqhajrXyHCKBvsvuUDIrYuz9SOntbSn063IO5uKLq7aWQP6nL/tF0GuEgJbyopk0/qtD+Ol8oTGm2cySqsnrODgQKihizI2GnztL3XNqyMBOEj0qog3wQ/TLqrZpMeGPamXbsknAUx5fF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663713341; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+HHAGmPTEVaK8BLouLq5FfiutB4A/NBtflNNRIi+YP0=; b=V4yUu3dO4z7TxntySCzbFxMphapvm6uPCypjSq0HP8pLVdiSz1ThirNJCdHPnkd+oqMODUWEsqnMIDXkNH4FYXKpyHPJSYaXlbPe39jCn2rYRz7FPAuOyBV+M16vLs/hpRp8QvxUVAhGyK0O37XKd7aYza+PhGRSltSO6QGNs9Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 166371334123269.64149320219974; Tue, 20 Sep 2022 15:35:41 -0700 (PDT) Received: from localhost ([::1]:53788 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalq7-0001Lx-Ei for importer@patchew.org; Tue, 20 Sep 2022 18:35:39 -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) 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) 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-Google-Smtp-Source: AMsMyM4BgIB0U7DZmu82wSSSuFboTO8DmfarNDzIZKcdn0TVlfsKZVssA/WZKoyTUmQeaGsaT33h2Q== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663713341636100001 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=C3=A9e 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-cros= s.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 =20 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)/de= bian-toolchain.docker \ $(call debian-toolchain, $@) =20 # 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 =20 -# What we need to build QEMU itself -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sourc= es.list + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ apt build-dep -yy qemu =20 -# 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=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends \ + ccache \ + clang \ + git \ + ninja-build \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-alpha-linux-gnu \ --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663711648; cv=none; d=zohomail.com; s=zohoarc; b=Jos1EtuaIQHGaJLCZ9XgMamPR7kO+imUU5VceXMUMBt6At7Mmbnkdul5DdsI/uinEQeskHYzwrTTSs9GC3PrbQbpZiCGqvVj2bKkxMfPrdI4MMOorXQM2dYS7XK7uPGxPvy0wMLtyczLqAZjjpSwQu/OCJOdtUclvc6bvSOoEws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711648; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=3dsFavzDTb9lwDtGm2WAvmjX0ZIRpS6ht5ulPEZxGuM=; b=ar+em3ON13bTNQnUh0R+GSlTfRfVSehhoxqYeU/c0CoWL8VfLzxWlw0oxxSxeGRMb3hZHGCmnzt6xda+yKxTOOg4CQ1BFMLBpWTSFv8KKGRUcRiO83zi/iwJP4bvx1hm8Cn5Wr+67729t82fuoa9pkWSg0h9tYxqwQomj7+Mjt4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663711648953735.8100985077527; Tue, 20 Sep 2022 15:07:28 -0700 (PDT) Received: from localhost ([::1]:60210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalOp-0001dc-F3 for importer@patchew.org; Tue, 20 Sep 2022 18:07:27 -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) 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) 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-Google-Smtp-Source: AMsMyM7WuR5QTJNEsRVtGdJ4WjGZjgsUgkX8WazhwC+sjo094gozFewTWBWD+bR2rskt80GclDa1qw== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Ed Maste , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663711650130100001 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=C3=A9e 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/free= bsd-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=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e 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-sphin= x py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy s= pice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e 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 net= tle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip p= y39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image= snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/free= bsd-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=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e 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-sphin= x py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy s= pice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e 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 net= tle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip p= y39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image= snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/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 =20 -RUN pip3 install meson=3D=3D0.56.0 +RUN /usr/bin/pip3 install meson=3D=3D0.56.0 =20 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/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=3Dnoninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 -RUN pip3 install meson=3D=3D0.56.0 +RUN /usr/bin/pip3 install meson=3D=3D0.56.0 =20 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 --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663711119; cv=none; d=zohomail.com; s=zohoarc; b=Fq+dMskt4xsySPJrJxzrN1FcPShtKDll/0DM7A3cvVWpuquyevW0bEoy4+rGkifXmpqlKwaFDGt+KhL6jItSIWo4a2AIxnET4TeMVFeEyn9yL/tO7suCuYie0IkxR63pT+Nf2bwvKSojxbzGuscUzsmjN2BSuilMXw85jWvLbh0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711119; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UzR2D+6N94dMx17IDc13/hJBj0Ma91w/F29E9gyQ68w=; b=L4BNoa7+rOlfPY4CV00VtfPiERX7SuLyGyNcdZrRUdsMwcw0WWXOOFqXkfrTc2ltwjaz72gTXSaMsME1/vyA7hGsmZD/Mn6XyIINjkCc1ilEB2Arbf6QYnZQCvZxGBIIB8q1jsz3LV73nGyAlalqN4ooKrHd2BEb9LqMrhPJews= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663711119662816.7040965181336; Tue, 20 Sep 2022 14:58:39 -0700 (PDT) Received: from localhost ([::1]:58140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalGI-0006Ls-Jn for importer@patchew.org; Tue, 20 Sep 2022 17:58:38 -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) 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) 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-Google-Smtp-Source: AMsMyM4IaqP/JoVEB8balaNyBBbJshI4w9enh4Ehfhw8ltHjCuIGugGXdd3ACvUnUnrM5SJEvrCjsQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663711121122100001 Now lcitool has support for building a x86_64 cross image we can use it for this. Signed-off-by: Alex Benn=C3=A9e 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-cros= s.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 =20 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 :=3D debian10 debian11 ifeq ($(HOST_ARCH),x86_64) DOCKER_PARTIAL_IMAGES +=3D debian-amd64-cross else -docker-image-debian-amd64-cross: docker-image-debian10 DOCKER_PARTIAL_IMAGES +=3D debian-amd64 endif =20 diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/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=C3=A9e +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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" =20 -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture amd64 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt install -y --no-install-recommends \ - crossbuild-essential-amd64 -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ - apt build-dep -yy -a amd64 --arch-only qemu +RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ + 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 =3D '/usr/bin/x86_64-linux-gnu-gcc'\n\ +ar =3D '/usr/bin/x86_64-linux-gnu-gcc-ar'\n\ +strip =3D '/usr/bin/x86_64-linux-gnu-strip'\n\ +pkgconfig =3D '/usr/bin/x86_64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system =3D 'linux'\n\ +cpu_family =3D 'x86_64'\n\ +cpu =3D 'x86_64'\n\ +endian =3D 'little'" > /usr/local/share/meson/cross/x86_64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /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 =20 -# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV ABI "x86_64-linux-gnu" +ENV MESON_OPTS "--cross-file=3Dx86_64-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-linux-gnu- ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-lin= ux-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=3D"x86_64", + trailer=3Ddebian_cross_build("x86_64-linux-gnu-", + "x86_64-softmmu," + "x86_64-linux-user," + "i386-softmmu,i386-linu= x-user")) + generate_dockerfile("debian-arm64-cross", "debian-11", cross=3D"aarch64", trailer=3Ddebian_cross_build("aarch64-linux-gnu-", --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663711991; cv=none; d=zohomail.com; s=zohoarc; b=e8qOtvVHMeWoQM7daBqPDjRrqPPabinaFaMdXcBB/XH1KGs6afaYvONDEUgQ6zclq/vOTVLrDc/xoRtb8r9GI8cHHiL/cLOeyOMuatyMQ+J9gbsB3g6qkLf8KOJM88/XNCgbvmT5nvTWSfAoeK6OUSb9qnTt21Vo1hd/MskdwpQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663711991; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uWDiF1jWgciTeV2Qg8CZ4j2xTGM9MuFQveZ8m5IhBP0=; b=iYaG6gd7xBe0Qv3MOwH9Qb2LjB8vRf1sr+PkrEVdXxQt4dLtHQx3XvpxsQ38nXF0Cl3/AnXk5qhyQFwgLJUNbGmw01vgxO20cPbe8x5YWqigXR+gLBExiKnKEGsMbJ2SEi1JB5fAMmhysaKLg4zWHnlnUIA6js/GfgvMv/Mywps= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663711991415312.0958584586974; Tue, 20 Sep 2022 15:13:11 -0700 (PDT) Received: from localhost ([::1]:49064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalUM-0004j8-1K for importer@patchew.org; Tue, 20 Sep 2022 18:13:10 -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) 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) 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-Google-Smtp-Source: AMsMyM732kMLeyHgdJ56RHLPssBOBvSt9tFKVro7ePE7D7InJ+sKzsqtI5EP+3pAd+8sfz0xyyAd3g== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663711992000100001 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=C3=A9e 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)/de= bian-toolchain.docker \ $(call debian-toolchain, $@) =20 # 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 =20 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/sourc= es.list =20 RUN apt-get update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663712429; cv=none; d=zohomail.com; s=zohoarc; b=UvhBJtdZHgn71jLY9umRzNfkQUvogScXTdXUp6rZonlgkTNwhatKLZd49OiQNt95fknHBhBdvEWIDR8lu+LiQC/iDqXen4tOvRozJ3K850rnLe+DRm0vYUOFwZuAOUNhAAnlQw71zR5TQpG3wdG5gmm3CHLKLCIpv8CuVAUsMoo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663712429; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=x4S1RGKB9TLIMCKmtB9fa0XzaDftdi2Kh+Izh7wFJ9E=; b=hC+TGctD4/wo/ndGGgUCUdnr3QLZdHndPbKLCqAd0LZLTRc72iEwIe2eBRxN41rTQsaDvF++BhFntsQAAk60e9Cix8Jc4VrAKW9++B3zu/IlLyYwFRwPEh0STgPFpvd+tR2oX4ZErxofm7Lw5nJin0uRlF7DSFoBhrZ167fcEVM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663712429649969.9384190542589; Tue, 20 Sep 2022 15:20:29 -0700 (PDT) Received: from localhost ([::1]:56144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalbQ-0005fG-Am for importer@patchew.org; Tue, 20 Sep 2022 18:20:28 -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) 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) 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-Google-Smtp-Source: AMsMyM69wMmg8FiDl/2sGLUsg9wqUAp3hgrJg1cZ5d0d63UuzpyzHwrOyUIMt0w22mishYBLocXQ5A== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663712431355100001 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=C3=A9e 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/d= ocker/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 =20 # Install common build utilities RUN apt update && \ @@ -15,11 +13,18 @@ RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends \ bison \ + ca-certificates \ + clang \ cmake \ flex \ + gcc \ lld \ + make \ + ninja-build \ + python3 \ rsync \ - wget + wget \ + xz-utils =20 ENV TOOLCHAIN_INSTALL /usr/local ENV ROOTFS /usr/local @@ -32,7 +37,7 @@ ADD build-toolchain.sh /root/hexagon-toolchain/build-tool= chain.sh =20 RUN cd /root/hexagon-toolchain && ./build-toolchain.sh =20 -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/sourc= es.list # Install QEMU build deps for use in CI --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663712975; cv=none; d=zohomail.com; s=zohoarc; b=hZss5bP0TcCAQ5HIlbW3r6AEhODsyW0fTCIX4U0X6mIP/+Ygou1v1qcnHQKZJ/1WxfETmV4w3vyjQS8s21r0VP50Xx0i/BXuyVuMkRsYkxuZyaaTvGxGY8zeIRl+qvqaanjIs2Y6fAfnYAlY8n508YVnK1+VnvWH45u/I4j3OGw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663712975; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FXHDHf2ajcZm8Hn3yqqDo1FsuNZsNVS58iHbQW1B8lg=; b=Nx/pagWxht8wWK9os2UrdU7Gz1zWZ8zfuK8+vXjU/KVqTMLSoKxJBdpo0EIJy5eOLFsdqGqVxNLz7xPEn0ODymEHwfB+Anso+W7u6bdiwv1oFIjDBc30ECbehY1CKzGkfT4xp0Q9pB/HSb6Egv0vcbNoK+TTuYk7IeTHVf6JgPQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663712974996405.2590642731708; Tue, 20 Sep 2022 15:29:34 -0700 (PDT) Received: from localhost ([::1]:37574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oalkD-0002o2-IR for importer@patchew.org; Tue, 20 Sep 2022 18:29:33 -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) 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) 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-Google-Smtp-Source: AMsMyM5AXyMz4duTVMX5/zG0O764evzxldO69VoRYhwSQyn6xr9Nm3MgKK0M3WcyV6erlstzeaJYZg== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663712975998100001 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=C3=A9e 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)/d= ebian-toolchain.docker \ $(DOCKER_FILES_DIR)/debian-nios2-cross.d/build-toolchain.sh $(call debian-toolchain, $@) =20 -# 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 buil= ds DOCKER_PARTIAL_IMAGES +=3D debian-alpha-cross DOCKER_PARTIAL_IMAGES +=3D debian-powerpc-test-cross diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docke= r/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 =20 # 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=3Dnoninteractive 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=3D0 /usr/local /usr/local --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663709067; cv=none; d=zohomail.com; s=zohoarc; b=Oym5rwh+bv7sgn/vGFgByNCZPf4DGzi/J6wsZh/GHf4yssLnjDJS3LtcjIv8BNgY2BF7hFTGnfajFV0Yk2MZTlukWraR6s+jCQtEZ91xuxRb4r5VQjeAakBvKIFy1gPn3sM8AVos/JKyC/RmGNaDgFhYRTiEjWr0ng+WTMhinAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663709067; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=AnscUj/WsXzqq3s+vV4bQPFCFx5NHk6AZxIJISHW2ag=; b=h+I7LhmXniIRrF+LEdnY9eQQ+QXNkagKHywyZ4jSRTjsRbywLZJdoTDl9N/x0Amlteepu5EKSASls4fSVxPHODPEI8tV0bNbJvNqgbRnjKOwVnUJYURPkTBX2YLRUqx8XFeY5+vhS7lQwQWoIoiIEDan39MEhUT+bnvroVdwHgk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663709067689267.0034421039064; Tue, 20 Sep 2022 14:24:27 -0700 (PDT) Received: from localhost ([::1]:37526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oakjB-0007uR-Gk for importer@patchew.org; Tue, 20 Sep 2022 17:24:25 -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) 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) 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-Google-Smtp-Source: AMsMyM4oFKAhb0a2HcP/gHJZFMLPq9DPpJ/DnLW2bErnZvjm8pPPplMBryR/dg/62UefHTg3+VTxTQ== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663709068213100001 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=C3=A9e 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) =20 =20 -def _dockerfile_preprocess(df): - out =3D "" +def _dockerfile_verify_flat(df): + "Verify we do not include other qemu/ layers" for l in df.splitlines(): if len(l.strip()) =3D=3D 0 or l.startswith("#"): continue from_pref =3D "FROM qemu/" if l.startswith(from_pref): - # TODO: Alternatively we could replace this line with "FROM $I= D" - # where $ID is the image's hex id obtained with - # $ docker images $IMAGE --format=3D"{{.Id}}" - # but unfortunately that's not supported by RHEL 7. - inlining =3D _read_qemu_dockerfile(l[len(from_pref):]) - out +=3D _dockerfile_preprocess(inlining) - continue - out +=3D 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 =20 =20 class Docker(object): @@ -309,23 +304,10 @@ def build_image(self, tag, docker_dir, dockerfile, if argv is None: argv =3D [] =20 - # pre-calculate the docker checksum before any - # substitutions we make for caching - checksum =3D _text_checksum(_dockerfile_preprocess(dockerfile)) + if not _dockerfile_verify_flat(dockerfile): + return -1 =20 - if registry is not None: - sources =3D re.findall("FROM qemu\/(.*)", dockerfile) - # Fetch any cache layers we can, may fail - for s in sources: - pull_args =3D ["pull", "%s/qemu/%s" % (registry, s)] - if self._do(pull_args, quiet=3Dquiet) !=3D 0: - registry =3D None - break - # Make substitutions - if registry is not None: - dockerfile =3D dockerfile.replace("FROM qemu/", - "FROM %s/qemu/" % - (registry)) + checksum =3D _text_checksum(dockerfile) =20 tmp_df =3D tempfile.NamedTemporaryFile(mode=3D"w+t", encoding=3D'utf-8', @@ -371,7 +353,7 @@ def image_matches_dockerfile(self, tag, dockerfile): checksum =3D self.get_image_dockerfile_checksum(tag) except Exception: return False - return checksum =3D=3D _text_checksum(_dockerfile_preprocess(docke= rfile)) + return checksum =3D=3D _text_checksum(dockerfile) =20 def run(self, cmd, keep, quiet, as_user=3DFalse): label =3D uuid.uuid4().hex --=20 2.34.1 From nobody Thu Apr 25 06:37:08 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1663710673; cv=none; d=zohomail.com; s=zohoarc; b=Z2w8q+4CviwyrVbPO+1/yg4SCTq20e5c2VbboqwRCIbTbiZmLoa9nKj+EPbE+haoXzdy/86zXHivhf2+XHoSyxt0ucwZBuFHlV5tUeB0MD2NEes/ZOuzhtBjEqZ0Nhw4FcUPQhsEBYC1IyovIdR1xgJIf3DhUCpPjL5XbyF+HZM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663710673; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jPKx4bLo5GwU9q6PEj03jAJlnFywQA8HkRlD35mQyEY=; b=oJEzGLU2bS+IQO8eXNmgUGmxoGyVRBJtwRYDN/DMMb+FBU9r/5AwLzPOBgR1ii8+HCUy6XAJIx4roWgn1qZa2sVxct/++qj1pHV4INY3H/pRmmABQrgokWQEQ4hH1SR9uL4XLSHoQj5QxKBp1XwQgM04DiYZ6Sq/yJcCVTBMJbw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663710673369377.005330945668; Tue, 20 Sep 2022 14:51:13 -0700 (PDT) Received: from localhost ([::1]:41014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oal95-0007Yu-Cc for importer@patchew.org; Tue, 20 Sep 2022 17:51:11 -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) 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) 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-Google-Smtp-Source: AMsMyM4i2YABXW+HrBLJMoe3vWhp2NtGrdMejfzfWzEvACDq2no0/liTRqueZ7o3d7i1yrpZsgeE+A== 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) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1663710675315100001 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=C3=A9e 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: =20 .. code:: =20 - make docker-image-debian10 NOCACHE=3D1 + make docker-image-debian-arm64-cross NOCACHE=3D1 =20 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 =20 -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")) =20 -# Enforce dependencies for composite images -# we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES :=3D debian10 debian11 +# Special case cross-compiling x86_64 on non-x86_64 systems. ifeq ($(HOST_ARCH),x86_64) DOCKER_PARTIAL_IMAGES +=3D debian-amd64-cross else @@ -89,10 +87,6 @@ endif # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY=3D =20 -# base images should not add a local user -docker-image-debian10: NOUSER=3D1 -docker-image-debian11: NOUSER=3D1 - # alpine has no adduser docker-image-alpine: NOUSER=3D1 =20 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/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 d= istro -# 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/sourc= es.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=3Dnoninteractive 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 '[al= l]' | cut -d\ -f2) diff --git a/tests/docker/dockerfiles/debian11.docker b/tests/docker/docker= files/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/sourc= es.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata --=20 2.34.1