From nobody Mon Feb 9 16:21:41 2026 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=1663171671; cv=none; d=zohomail.com; s=zohoarc; b=H11kYFhw/SUHqHaC2WYcU9O5grtpQhPIIxXtkRKsDv2VkF0e7H1tBTFkw986tKb9L8eOiJX5/dkjCRDhF4bZs67HRe9mSWBIZCqOwRzvImvBxuK9JHg0jQfqW3hoV3ridOdwjQxGNoQD3TV/VOiFeoV00Hif6Ri3tTqReqU51c0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663171671; 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=jrKSxnfwgGSXnfdRpcO/7SXLAwMYVDBeU9cPTzC5/8c=; b=INvCIiV9C1wRQB9M4ydK/co4hK8gzwrXwmagmIuk7CEIWartRkF7o0SdYAJuoxzNn9v5wVrRAUosZFW1I0i7Im2A6+fA/KApBJH8C5cN/z6UlONaypRd9W2fsXeZ3Jb/dTKdDAweI3F+GUiUi3WEcjlvuLNCAzsEiT3PBYdnJCU= 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 1663171671424922.9915233563257; Wed, 14 Sep 2022 09:07:51 -0700 (PDT) Received: from localhost ([::1]:43232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUvU-0001dQ-Dy for importer@patchew.org; Wed, 14 Sep 2022 12:07:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnt-0006Rr-Qy for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:57 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:41888) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnq-0002mD-HK for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:57 -0400 Received: by mail-wm1-x334.google.com with SMTP id az24-20020a05600c601800b003a842e4983cso11896997wmb.0 for ; Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id e7-20020a5d5947000000b00226dfac0149sm13880895wri.114.2022.09.14.08.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 820FA1FFB8; Wed, 14 Sep 2022 16:59:50 +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=jrKSxnfwgGSXnfdRpcO/7SXLAwMYVDBeU9cPTzC5/8c=; b=UeCFjwsZm/xq6hwIwH8qqrE5hVLTm1fIshz48aVreOLgdzRTv0PWCVDpcM47X+jucI 7kqrtTswgwca/d7yMW8mWTgR58+992XEV7Crjumr3bxZLrtgfmzQk+uqK86Ib48YpydZ lVDnqCJDnHURr7YpsFlYeXd2h7WJkrcm33eEdeU4xMt05kEmIR0sv/+v6Wm5jzhiiSlM VLmy69351y7PSG0pCOw3VDKqgLE0lrLD4RRqS1647Jdf5wAyRowiKI+MdcZ1SIsdNk0N 3lMhOMjSrzyUxAgM/YOPheb63OAVfnaHijhbt2tIlYOjHkB3gCcOC/qJdd7BHqZdzw/9 6LPQ== 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=jrKSxnfwgGSXnfdRpcO/7SXLAwMYVDBeU9cPTzC5/8c=; b=WYsjKR8F2BTSCBqRCI1sS2XafIzMEJHN+vKMfwmIh5/aKcpgFEzgrvf9omxYZOjXHW ZOTgwmL9FbZQ6FjcCR9/5b8cLJCjA5LlX4aRXf9MmfEvpPW57/b7VFW1/vdkgHAeBtLa /mEhqyBaNzI6hdYjQ4iKtVY08V2sA1nrXVZJTqvv1Jlypwf+xBetKSMr3M9ndq5mYH6F pbE2jsWT+lrLq98vA3ovT6C4alTHlvmqn8utKYQqTycHQplLu36xjsvL02jiVJOlGBV0 nDuP1oAYc4YOkIqPVzM7kbskTa/mMOOTT8tS48hJE79dihNuxW/BnaC+DlCT0mGRoM+Z wqcQ== X-Gm-Message-State: ACgBeo37nk0a4QjtNiBCnJ79Q8dRqrnkoyFFlP+69139G7Z37i/ponAk fSIxa883FJtdx63XR21YuEIaFg== X-Google-Smtp-Source: AA6agR4FTiACD8D+YVwS+03T50MR37j5MdyoS8pzBu5SeGTFHBliCcOhgIgHMzm9UgJRdLhS9KCtWQ== X-Received: by 2002:a7b:cd96:0:b0:3b4:856a:28f7 with SMTP id y22-20020a7bcd96000000b003b4856a28f7mr3762687wmj.117.1663171193076; Wed, 14 Sep 2022 08:59:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 01/30] gitlab: reduce targets in cross_user_build_job Date: Wed, 14 Sep 2022 16:59:21 +0100 Message-Id: <20220914155950.804707-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663171673657100001 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 --- .gitlab-ci.d/crossbuild-template.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 Mon Feb 9 16:21:41 2026 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=1663171669; cv=none; d=zohomail.com; s=zohoarc; b=dbXuppdBCodg4ua+iRwTd9V7BZBmzekbmO273/m0p2dx4DALZelM/JU4/5aWx1IJIwcfENuKwiJ1ILCH4VwjF1xdclj96PIwFF2o3BaJu+tV45BwYmVqtTU1k8pfv0scg7Oh4YeYQS4byXsGJ7R64f+Q5c1aCx45N1EAsLIrLTo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663171669; 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=GkqXdvguCssbIQXu4uUN+R8nK9yQpERJYK56Jfq2cFU=; b=hJTbJbeaNh+JoEk2o31FuV40m5dGzO+j4m24rBLlTb1+ZkcJoGiEAkbohtvGBqWSiDJVfRrWAfHbQQm8pOEN4KrOUagIwy9pRM2q8H1ETWXhEe+2bZ+skeBEIMiqa+GzZQFi6Sa/VAcZ7LamrrKc2j+xiMA1AXiEUBI/+04X+p8= 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 166317166983422.160496439594567; Wed, 14 Sep 2022 09:07:49 -0700 (PDT) Received: from localhost ([::1]:44896 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUvT-0001YY-8A for importer@patchew.org; Wed, 14 Sep 2022 12:07:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUns-0006Rf-99 for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:56 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:33783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnq-0002mB-ES for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:55 -0400 Received: by mail-wr1-x42c.google.com with SMTP id k9so26487556wri.0 for ; Wed, 14 Sep 2022 08:59:53 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id r17-20020a05600c459100b003b492fc1d86sm9171633wmo.41.2022.09.14.08.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8DCF91FFBA; Wed, 14 Sep 2022 16:59:50 +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=GkqXdvguCssbIQXu4uUN+R8nK9yQpERJYK56Jfq2cFU=; b=fQ0qtgagD7f/djOKM7npRrAxkRTJ/XIAwNO6RUaGHpoxiBzUb77UlAqtO/BJgt5JBo /USJUWXv4EG+VFYuFkQM7mEwUdSuSD/CVDZmOxjbMlZ/uA/d1pAJzaK9CDZf4LnSma0Q W7o3RQCBa3nwL8O4mazhvdrwAD3FP87TMgX41dP76ysh5Rc7uyWOBVNj3jNPsGtpwYF4 +wl3sxi1lqsRdF4MH/a8DYhZtMEvDfHhtzO8StPdvLdSjmWWwUy6GUSdv/yDvvVFw80k 2f5am/qFtNs8JJh3XYpnMXtTVgCNKCoXlLbOEoJNil0lpisbbYYvEAPDXuKoZerL/KIv VPoQ== 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=GkqXdvguCssbIQXu4uUN+R8nK9yQpERJYK56Jfq2cFU=; b=2lOollodTalumLu20ZElMROl7nu6gU7fkc1LArYv5IKDGLsIbckxudSGn/wm1uQZ4v aYDYhdXeMWSEzDfOnVtxnyr2xYdmtOXU5/ckaBaTve+yCSBiPzOES47IPBr0VCVOJxPt d4h4TczPMgqfvdpCHFkBAe/As/cN7vd2n6jVJMPnEg7uXAgDBAEVIYetDBILWLNnamXx y8jXD6WdLnLalGPGd6HnDFZ095SIgF+QTg59O2p1hwDFo2dG+FzE6w3/urCQT5fiYoRA 11wDNuOlG083HCHfA+d1BN7vRNEoIchVnfhOo97R/6ooT1Vta6QQSoGFjyglCNtmLepV QMSA== X-Gm-Message-State: ACgBeo28xOo5baPh2jSDLhYxsu6Z0+Y4/Ogz2bk6QUUKPI3ygEVPINRr 6mEt+0WZSrLW8fEKwJS56WoSbw== X-Google-Smtp-Source: AA6agR73uCv+VJdzRd188eEIB7cx/B1MB1JuSFl9J4nkGhwqn8SC340HW6rV2/vF4jHIeNeV9+Qqbg== X-Received: by 2002:a5d:698f:0:b0:22a:bdfb:b00b with SMTP id g15-20020a5d698f000000b0022abdfbb00bmr6030689wru.355.1663171192632; Wed, 14 Sep 2022 08:59:52 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Thomas Huth , Alistair Francis , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 02/30] tests/avocado/boot_linux_console: Fix the test_aarch64_xlnx_versal_virt test Date: Wed, 14 Sep 2022 16:59:22 +0100 Message-Id: <20220914155950.804707-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663171671484100001 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 --- tests/avocado/boot_linux_console.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663171994; cv=none; d=zohomail.com; s=zohoarc; b=FO+szQXkw7mlRCZeaepi1x0tFLvlKwjAhE8XhERAsUNFHPz3g0u2bIZ/i+kb3M1wyjlrtwDuq3k8uIslhDGl0ON8WGv/Km2KGILR77zFopw4CaWxypGhiluLSS3hZhP+1C4Xjlz63HyxPstBEqRoVK4QukM9kBAiOLaYcJJUYDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663171994; 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=HoXaq5wqa0NQD2yFNqfhg3M2YWScwtFEAMJcP4/Q/QY=; b=PEgJbintD/DS64rFyfnRyDgK+fNRjIV8uMip8RsR4iVQRMS05f1r/K2TgUe6abNiXF7d+T29Qv1tQEx/oMm00RytP1AS9bEL6VmM9qa9YpFvGGh1+jHKjcBNQ41dttbIwr7fN4r/jQK5VVA6WYHi5CsbO1RsT6xlExyxNuw35XU= 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 1663171994096400.6049976831589; Wed, 14 Sep 2022 09:13:14 -0700 (PDT) Received: from localhost ([::1]:48916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV0h-00088g-Hl for importer@patchew.org; Wed, 14 Sep 2022 12:13:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37160) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnt-0006Rw-Uc for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:57 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnr-0002mH-Qu for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:57 -0400 Received: by mail-wr1-x433.google.com with SMTP id g3so5533578wrq.13 for ; Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q22-20020a7bce96000000b003b4a33a7d08sm3037321wmj.9.2022.09.14.08.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A30D41FFBB; Wed, 14 Sep 2022 16:59:50 +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=HoXaq5wqa0NQD2yFNqfhg3M2YWScwtFEAMJcP4/Q/QY=; b=XFBMLwiCLPYPERy/Edsd44FsQhtwtz1OKx6owOtRZAxRMmLq99x9Tyxo3tNc9xPm/J ooAN6MyrPCK515MIvREdpsqZ5oPcf2wb1QDTeHFnEpnH09Q2eK52qjZEJY1GStL20bu+ jtL9x/LkG9nedxjLUlzIHP0fEZvcsysoisBdw9390SiUM9SV04gf5DapdGYNpNzNp2UP 9/hgHp8H/HSmnSYMyyoAFA7WukBV314FcLAnvZEWMD4BJF1HBzCIEROrau8nSME42Qv4 hEhqKNSgXdu/37KP5fNl9iOrCu4gFRA4YQOnugQCOJStiq3LORfHYxSL8GPcm/3IuXnY aa/A== 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=HoXaq5wqa0NQD2yFNqfhg3M2YWScwtFEAMJcP4/Q/QY=; b=y7BLmnjEDbreoWTz86qvqoMVMj4IoyjRuoZebutCor4HMPOD9ZUqkFCX89jU3x2SJu EQP+gtBaJ5jaXokm2V5CQWgWZDEzhn1xZ1tqrsOTwcozJxb0/uKo/Cj9FyiPubrSVg2V 78vfD1bBdkNzuPNqWN/aX0B6cDbbUg5SHc2tofQuM6GaVzkh2Ypb8Pe6zCl3R1GwXMtX X99Azx/rZP5B+MNKhV4eucVqRBDhxsNiGgF9VqO1SrumcQVELr1viteEyvGp4H94G9Dm zrOrc6XUbeobUkSTRBcmK3wPNbWL2l6bYnjAWPG/hjWNHaefdqHZ+VZ0JoH/eQgZLNGt 1hzg== X-Gm-Message-State: ACgBeo3VRKTXQXIN+58HD1KRVqvtN4GvN4QcY2G1RlbtLLffcpxvZFoA wDayO5akGxYsurweMw9kEHB31w== X-Google-Smtp-Source: AA6agR4EBx5R4460Su3aAFowAVUwNIK2kZk4328VTE3YwJtaIeKHAIVBdVbOcuyTg3zuPosTLD7/jg== X-Received: by 2002:a5d:59ad:0:b0:228:d709:43cd with SMTP id p13-20020a5d59ad000000b00228d70943cdmr23264915wrr.30.1663171193419; Wed, 14 Sep 2022 08:59:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 03/30] tests/avocado: add explicit timeout for Aarch64 TCG tests Date: Wed, 14 Sep 2022 16:59:23 +0100 Message-Id: <20220914155950.804707-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663171995756100001 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 --- tests/avocado/boot_linux.py | 1 + 1 file changed, 1 insertion(+) 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 Mon Feb 9 16:21:41 2026 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=1663171984; cv=none; d=zohomail.com; s=zohoarc; b=DOTvy2CXHw/xhIfhdvTtW4fcLsE1OcPvEIG7xsbKDOgmHbCvP5EnUCNVC3VdBDqSWLFEy9jM1XrBsuZlMcWT9ibt6ehT4ojaV+w4+tskZ4Yz2DdaiLSppWmzFJZAQg0nGHtLERjyp8UkpRSvXrjUNQdPnJ1wwIjqCltBtSeXAfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663171984; 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=XT2vSxrm0rHLngSQcFythecX2OgBlSa9qVvKO+2mI4o=; b=AMY7xZDlBpZJgDUEsSAzMGx4XA1tylAmsBsw9Sz/W/xnz2PZSaGRcSHp1wC6BLtzJvmjHxEdG+Z8dcGvfIT79mbtwFBqrAFCCNnGE79YbrbFQOxDATgtd53GMwRhh/rOR2qimnV3TpP72peBqbgLRvX0Wor0iD4NfMHr9mMbvyU= 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 1663171984845762.6324834184976; Wed, 14 Sep 2022 09:13:04 -0700 (PDT) Received: from localhost ([::1]:48914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV0Y-000871-Uw for importer@patchew.org; Wed, 14 Sep 2022 12:13:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnt-0006Rp-Rz for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:57 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:36662) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnr-0002mM-Bc for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:57 -0400 Received: by mail-wm1-x332.google.com with SMTP id i203-20020a1c3bd4000000b003b3df9a5ecbso11094449wma.1 for ; Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v2-20020adfe282000000b00228dff8d975sm13349019wri.109.2022.09.14.08.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:51 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B8F301FFBC; Wed, 14 Sep 2022 16:59:50 +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=XT2vSxrm0rHLngSQcFythecX2OgBlSa9qVvKO+2mI4o=; b=xyMBXQaAi2b5Q/qmH1Kh5+D/jPXq8r7Frkcca2ZGhy2V2UWC25ycVNTNYY74pY2EA4 xHWJ6vroeX/uAOkd0yLTQhK/ITnbhYF7PYSyEPRBjA15hWq8es+AmhMVi/vINjdoeplH ni6XgOiQQlgVFDiNuC9tTiVOcEULHyoN0QikbSgeaU4KNXaFSLswTjXD9YQkgnWcpqCW f4q4MhzqdGpiGIFExUUeWXDZkOmfFXI/zAKcjaXjJvewNneQih4l4hWO2R/QELwbmORT ORvtJFkwq1fF67ZMMMa3zjebnBqCsdNNnRkZhF8jKIlTrHPr7FiCBRWnn5lgq5TRV0yI ThSg== 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=XT2vSxrm0rHLngSQcFythecX2OgBlSa9qVvKO+2mI4o=; b=BmbPqi6Na4Y3Q88nzhebbVMJf5PVWjbbldfhYdgU4kRGDec0DfSEL0ds8IHKCAESKE 6fUseHp6aUFB/52Uw6Q+rLobWXr3yvCJazE1mklb/jIfZcF+Z1lq+8Zr5i7nXqqxRwu7 uvoalt9cwPfH8ZzXIP2QP3RLZ6pO2o9U62YoCtiRPVe/FYeJ2efr3RhFM70vZWgKkqJf WmsT57kcg8zLHgdnF1N2EhD85rZCA5UsfWBa2gu3w3RMv8heMdsaQ3F+we4UEkXOm210 vHj/c6deTMMY0gjG3h/fyUi7FLeRhnTWRbkbQ5khvCP5RE0W92WS5Up6I0J5Kv3JmMkW 8nlQ== X-Gm-Message-State: ACgBeo1WKjq3YwlH/wZr3LPM44/CZ5fxONRyKIbGZ6i3vzILyL6MmGsX 4DGHCiRKUl+aimzBVTu/iEBh3Q== X-Google-Smtp-Source: AA6agR7aMVgT4XADv/thicNiZwltKxpu6JhGZamzyp7L2ynBXzpbHNVALQa1aYqPLHihb93x9NMRCg== X-Received: by 2002:a1c:f008:0:b0:3b4:9afb:7c16 with SMTP id a8-20020a1cf008000000b003b49afb7c16mr3629435wmb.44.1663171193844; Wed, 14 Sep 2022 08:59:53 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal , Cornelia Huck , Thomas Huth , qemu-s390x@nongnu.org (open list:S390 general arch...) Subject: [PATCH v2 04/30] tests/avocado: add explicit timeout for s390 TCG tests Date: Wed, 14 Sep 2022 16:59:24 +0100 Message-Id: <20220914155950.804707-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663171986177100001 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 --- tests/avocado/boot_linux.py | 2 ++ 1 file changed, 2 insertions(+) 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 Mon Feb 9 16:21:41 2026 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=1663172819; cv=none; d=zohomail.com; s=zohoarc; b=hGxA0VvCm2J7bCP6gBxLxXf5PKkgHY/MAvy0Kzn+WgpmyCh/G5GlgrDsx0qOiHVRkag7AcwV/vgDDG3Usr105Km+j6y7s7GU5OEVFV8l55LYuRaNAyGWzsz2D16BEM4IJQ+fcbW/z/OWb5RpRe9g5BSTIKEK6zLSowi/BBLYsWc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663172819; 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=BknxQV6MVmcZavM1lYtAyUVlipzDOdv8QGgE/5Rl11s=; b=PkKJkWPHyzxJ3mfy5FIyVJhL1n7A4VH1xm57gAX2TW3ONM0SDz5rIp9f1nqiubx8ILzfRIiOaDuMEtzHMmp8y5yjRRLXvkPfVZMPnQyDc2Gn8bSgB+htplO0RKQYp5rgCSQ9Zxqubf+NeMRKTi4wpaB20lOFrylGWBGYpEcOjAQ= 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 1663172819118251.91363208393864; Wed, 14 Sep 2022 09:26:59 -0700 (PDT) Received: from localhost ([::1]:39504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVE0-0003IA-Cw for importer@patchew.org; Wed, 14 Sep 2022 12:26:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37166) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnu-0006TT-Nb for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:58 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:35812) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUns-0002mU-1g for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:58 -0400 Received: by mail-wm1-x333.google.com with SMTP id r66-20020a1c4445000000b003b494ffc00bso3322688wma.0 for ; Wed, 14 Sep 2022 08:59:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j22-20020a5d4536000000b0022a293ab1e9sm14170600wra.11.2022.09.14.08.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C49021FFBD; Wed, 14 Sep 2022 16:59:50 +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=BknxQV6MVmcZavM1lYtAyUVlipzDOdv8QGgE/5Rl11s=; b=gtZ/owBgh3ZX1O7ANL2s02hFC1hn9P1vdsXMom2VKqPMewA55YiDx68MeTZ3W5LRa0 IUhGls+C5nJtMmc1q/lN5OPvf3np1IsU4DbJTLnIjFKz2CWEP7gqMcEHmMwybes7g5fj 0WqX85b9W0ZlM5v0uwpdVP8JRqa1EXNB8sojFLlieLXSP9pCqwxM8S/SVeqV45HPzC/+ nbu7dY5KVH86kuwbug0suU4KtLs6024glfcAjgR5uI5+DqAIsCLr83iNNGIjklDXHwV7 ihP4fgQmJ+BzqS1o5O6OGmg2h+5MY7Ndzb6u/lVrUNHbFXAGl/mnuGof0hPyqwDKXbK/ lfYA== 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=BknxQV6MVmcZavM1lYtAyUVlipzDOdv8QGgE/5Rl11s=; b=qpI9O6lbSXCIgtBo6EiQmHdmt2ujUSnjS5dbzFcoYTeTRztyhDYjcMCPaO+Tvy4rKd 7qRkITHW95wSIDoLPXs02OmWapamLSYqLNE+d6m6u3Y3T6ohyoY5S9PG4RCj1qf3fi72 TZX1rApNJ/SjAwXZZ8TloYmCnlJzu9yTzjvao8EaMrHiyhYTEh4tYa3nTMlpyj/wlyC+ k8sF6vYIShOcyPKCl5MXQ0cPF/uyrmr6+gtmDdfq0fUYBoZDJQEggo1YUxZbn02ibvgv 26ZfbAQSRb9e/kN2EVNhMF4KDUiLtvKkb7fqNt9sccF0aTyZmNEGa8VjExjiq2ken0Hf PSYw== X-Gm-Message-State: ACgBeo38zvkYe6k6jJypM6X84GdhtB3zAmSfK9a+/0IdAA4z1cskfO2c tHZTD/KrnNV4oWFQ5Of+xEg8/w== X-Google-Smtp-Source: AA6agR5fy5J24N7FaaLcfzBKPlzCaO7w2sQOiBxq706oiZpOihgCdhxqSaspMObDlZJAI1tUaaqPpw== X-Received: by 2002:a05:600c:33a8:b0:3b4:874c:f48f with SMTP id o40-20020a05600c33a800b003b4874cf48fmr3518217wmp.131.1663171194650; Wed, 14 Sep 2022 08:59:54 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 05/30] tests/avocado: add explicit timeout for ppc64le TCG tests Date: Wed, 14 Sep 2022 16:59:25 +0100 Message-Id: <20220914155950.804707-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663172820012100001 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 --- tests/avocado/boot_linux.py | 2 ++ 1 file changed, 2 insertions(+) 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 Mon Feb 9 16:21:41 2026 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=1663171701; cv=none; d=zohomail.com; s=zohoarc; b=bfSfbY7inePa0r3RcYjgu0vRC6nsGFCv4HyhvvZA187zLLwzcb4UJcIbK+1qzDwMWlRNz/3u6fnbsWSJcs7iedwvZy/WBDF9Fk/PRPWLunkUyC0l96Sb65zE8ddRUjjd/RoHJGfbkqqSi5KXfslt+rbbievQk7Wrjimp60OgKT4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663171701; 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=kZdq/uKjk12WdalK+7NLnICP9eMfFlhN/OCSVSt/d/Y=; b=mmyUTXa3iBVCoihqd59gx1kUYw7Z6M3ZcF0mO/joz+MtcSQk//8XmZ01EWHH+wY4M+62wUArOItsUOTPSQhznxgHWGSE3kbhlqDQP7rPAJ7snlp/zk5bYELBzZRuMCwVbAaxGpra1CpC8APS7+JFDOky2b2w/qA/3qWzxY5oOBc= 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 1663171701266209.72855318469988; Wed, 14 Sep 2022 09:08:21 -0700 (PDT) Received: from localhost ([::1]:43760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUvx-0002IA-6j for importer@patchew.org; Wed, 14 Sep 2022 12:08:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnu-0006TY-Pt for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:58 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:34793) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUns-0002mc-Cf for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:58 -0400 Received: by mail-wm1-x333.google.com with SMTP id n35-20020a05600c502300b003b4924c6868so2485821wmr.1 for ; Wed, 14 Sep 2022 08:59:55 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id bt4-20020a056000080400b002238ea5750csm16849072wrb.72.2022.09.14.08.59.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DA3E61FFBE; Wed, 14 Sep 2022 16:59:50 +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=kZdq/uKjk12WdalK+7NLnICP9eMfFlhN/OCSVSt/d/Y=; b=iaC73sLPBN9HQvbiYfjSGwo6G5d52DPu5Q0zWbFak+CT06xmrthNRkG06HrvEMexJC Tpc9vmjBqgN9F8bKAN1Ipci5bAWVZkL/Z4okIVYNSmYYJaAnjtnZiMx+01hAT8uTjQqh AARB/cIbaxnPhO0v4QPKEBv874+BGyCLPJi2n4j5Kvglz/AwM1jVmUZ8jOkswjykAfRQ IkV5f5LtWSBfiGc8/99GWqrCqKFJ26bG1H2hdG8xj/gHufW8AQ1RIQhkIIQcHzxipK/x PvmzxUokR2JivltsXMGTmN020ttGYuLpzr17DwJUsb+cPpnMnJvC0/tyGfr8N2U1O95O Usug== 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=kZdq/uKjk12WdalK+7NLnICP9eMfFlhN/OCSVSt/d/Y=; b=f9QaQTUpTpRxj9KWJyZic0HRvVVuqSxvBISQ4ZIbJy46jm6DP0TVta/CKHkvQcqdil vDcOJWk/16fm6ZpMQxEGFif9rNASzPf7+7P0Brpp996KD9RbwH5S/B3YfTAavp6fTBa8 zgW98+MkJjVEDe8PMAqMNmde1lZWvm+kwQre7LCaCxVrAaEfJKr4qYNhbxfDvqym1y6C 2W3a1e0MmESwV/Frd2lT9nf2irRg/hA3RuZmYJmE5RBHUF20OqE9iLkDyFWqsbHmvAFW /vpOrv66wuMGgoEoXHYaqZ1k1buAJJ0CxtfyzziNdjJ4JZ11KVdMTg76IG1CLZ7UJZXz wtYw== X-Gm-Message-State: ACgBeo3IMeGD+QEOO451jwmgLxxUo691TOdXdQtVT2TgT3El+J/munIf h5M4ruGZfks78L6PclIaCdVurA== X-Google-Smtp-Source: AA6agR4+8bDBcavDtjWbbbQCXka5ib0Pw4HN79A6FgLN93HlWTbKf7HGQfTlNfkjizAzENT+Xq43Wg== X-Received: by 2002:a05:600c:3492:b0:3b4:9fcc:cbb6 with SMTP id a18-20020a05600c349200b003b49fcccbb6mr3075520wmq.42.1663171195069; Wed, 14 Sep 2022 08:59:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 06/30] tests/avocado: split the AST2x00Machine classes Date: Wed, 14 Sep 2022 16:59:26 +0100 Message-Id: <20220914155950.804707-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663171702234100001 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 Message-Id: <20220826172128.353798-2-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- tests/avocado/machine_aspeed.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 Mon Feb 9 16:21:41 2026 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=1663172371; cv=none; d=zohomail.com; s=zohoarc; b=REM7Y8cah8MHZSmZ/veEG2z6ccLvTlzSw/twKU8rSQNCJicVkROi/dW4nYrNyVJgSkpKU96Q3Jzju3B0X9iqhdju/d/riaJmELEkRegL83r3RAkD8lXZh3jqpIw2OdLt5rYLXvPZUwLfJVfD67XkFUHNDt1wvShSW5im9O1txng= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663172371; 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=1f/7sfWBRdUlRKRIHXh6N9sBf3lAWvS8nOz1+E+gsL0=; b=HwmWmtyPpJKunGb+B4BGg5ONyqCZOJ+TeAjMcF5f7LYDfT1A34KPwYM+3tPCaTDiXblH2b7ZRVflykWp4rypoEIxg9B3cEkbAuUuEPIlNPUwi914Ul08n5gqVrDkyvJj3SPIIEaFwkqElIs2A3XZuf3go4VxDwcUaqlNpakLV6c= 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 1663172371534957.3747339790024; Wed, 14 Sep 2022 09:19:31 -0700 (PDT) Received: from localhost ([::1]:35506 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV6n-0005fp-PG for importer@patchew.org; Wed, 14 Sep 2022 12:19:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnu-0006TK-Kp for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:58 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:46995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUns-0002n4-RZ for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:58 -0400 Received: by mail-wr1-x433.google.com with SMTP id g3so5533740wrq.13 for ; Wed, 14 Sep 2022 08:59:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l17-20020a5d6751000000b0021efc75914esm13523032wrw.79.2022.09.14.08.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E5D1E1FFBF; Wed, 14 Sep 2022 16:59:50 +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=1f/7sfWBRdUlRKRIHXh6N9sBf3lAWvS8nOz1+E+gsL0=; b=jSBVLqQL3V+5NWbp9+BIBQbsaY9u/EVdTVsRhpJwYSFs8MH7mOYbVCmUhSwKFHAWsm 6HsI9lyGhxcupfla2tze6WJUx4V0pGCjBQtv7gPkQ+jxCtFfiSr3CwIrwMdP4PIpC0+M hy/cYrSUt4mo9G9CZnw0eFOabDRbwyFNj6F7wCkmCZu9mqhcsppQ9htjUIoVVi9pc0LG 6GIcj1OErv2OeSdwINx+Byg5RexIKkQqLhIb2pgQVO8ddLw8K/b8AgtN3In3fd1/fqvP Hb5sic2wKbTc61VwstRiHFzdeTaL66rpP4Nv5telrTJdWZxCJp8h52PPlDHNr8muqnhy fSfg== 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=1f/7sfWBRdUlRKRIHXh6N9sBf3lAWvS8nOz1+E+gsL0=; b=kq/Hhz0PCrlGrkMVNiEjjTKZs67J12MN5to1iz+ftBhk4GkbRbbnlKL+VM2rJj92E7 HW0z7ehTkKhV5y4KO0V4cXNYTqVUrTCvUost71WpcI0ZsTHL0ugG/4iQ/Y5+71IF2rpe 9pXIoRNQvpZSYP35OvuNxStKtNXnSk7z68eKUZKFSgoGy6887utc520kdnG0FTKUzFAI wCHcnbFVHPJ4SgNa8qF/Acz+UBvXMy8zSD3GRPNSysFZStV++YZHdjFqFLCVhWxvg0Kn wo9nfgsk8s5b4nUDjJqEbpZkVuMhT51fIDt8KeLk7ORXQDU8P5KlzTVUmBe46/+6VuZm pdtA== X-Gm-Message-State: ACgBeo3FawZ7BL14H6tkHvno5wO7In0TezP2Rj+c2ATXgHLpcuEpNcq7 Jo3X1s6YPUYcekZT0iQK/BqSPQ== X-Google-Smtp-Source: AA6agR51Y7+YqBQ0gMBYuflAjezKUf1oxIfYmyETTsoRUVvHJW8TowZ5CgTGFHcDKfbeLmntoVffyA== X-Received: by 2002:adf:fb05:0:b0:228:6463:b15d with SMTP id c5-20020adffb05000000b002286463b15dmr22213594wrr.534.1663171195615; Wed, 14 Sep 2022 08:59:55 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 07/30] tests/avocado: reduce the default timeout to 120s Date: Wed, 14 Sep 2022 16:59:27 +0100 Message-Id: <20220914155950.804707-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::433; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x433.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663172372737100001 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 Message-Id: <20220826172128.353798-3-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- tests/avocado/avocado_qemu/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 Mon Feb 9 16:21:41 2026 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=1663172371; cv=none; d=zohomail.com; s=zohoarc; b=RJ3+tZ9WxGCt+qSNASPBSoM0FP4b87SQURKeVJWmjLQ3uBnXWxDO3FGs81Tdu0idIYYcdPoDQhmuQjfCnly6vBytgTYkSTnwgadRI5bim/MlqtD64VDbczD0OOplNQ63z4SRvrtiZAPbfykbuyt9dF3T2xkgMhtk9UDE1a6Fodk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663172371; 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=oVg0gNUb1gnpWZ5Xt/ps9KGAmZPADE10X+KbFxU79pY=; b=eHaQTEk/x+xpY47rwGovgcSAS+SXMUy/I7mgQPP2/xMsE9yToPLvM7VItF251uld4s9Uq4+6IfZj9ZSRXTehCMnk3eQO2VJE/b8jnUfxnGu2Nd9GjvmfayIpl6ZK/0IYCtWu1U35nD1wiC38GzAhbHUc6zxjssK8ZxKXrmIi24I= 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 1663172370987183.4417303549427; Wed, 14 Sep 2022 09:19:30 -0700 (PDT) Received: from localhost ([::1]:58878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV6m-0005ZL-Vt for importer@patchew.org; Wed, 14 Sep 2022 12:19:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnw-0006XR-8t for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:00 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:51970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnu-0002nH-DO for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:59 -0400 Received: by mail-wm1-x331.google.com with SMTP id o5so7864023wms.1 for ; Wed, 14 Sep 2022 08:59:56 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id p5-20020a05600c358500b003b47b913901sm8757433wmq.1.2022.09.14.08.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0C7561FFC0; Wed, 14 Sep 2022 16:59:51 +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=oVg0gNUb1gnpWZ5Xt/ps9KGAmZPADE10X+KbFxU79pY=; b=terdUEBjFFaoLk9PPJ++yQmoWc8+WK1FQpwq5oW6OLDXz2T6S3Bt7uuYk7bXgvHptp CbyjMjRI6oWTuBXQjzUk8nURmfJXHSaKPtLVjpAgocsVZ29DvqYotgdAGXExex0f7y8R 2y1SYdcmqhuPZWJ1ZwdWIa4nQBlzXJVMpxP7Ep6oyskD9NQ9RRz1Ec26eA8Sf4ZEnMLp 7XyYUcKr0QHRW2MOkuDTJUPJRPlvIyPS609l4WhoxFNZg/IeI78tJe/w0OfBuDOTVf0+ wWaef5+J5m0bGjPfzosL2KC1CGArEHO1dG3WkX54zel1Nt+kDnyKfvvuLNs+mYaS1Nod wKRw== 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=oVg0gNUb1gnpWZ5Xt/ps9KGAmZPADE10X+KbFxU79pY=; b=ckgTRb1jVqaCyv6vBDzlvaGy/Ev2N5JbVy2w5vZ8lZ3x20VWnHA8o2Be9SMfWVYipY RxzsaWZjckH8fB8KCuNZDpQSRBm0b/Z+PZrvckZ2r39X490W27eobzKF+buGB5ucqaY7 dxeZAS1+R864I3cn6b7lKbEnOBPvFJ7HVOY3e5HsD7YRVA0IJjKdU0MGu2L7SpFP3Zx4 gBg7zwEpi7WA3vrJR42vJLQKisTgOzxNdYYcsYAaQx9/yICk1+48hcrTH5xrSutNS2iY POKb8XmaRpL3ehv+MvW/DlPIwzyLM+CdCi0S7rJ45AWZtB+GUBEanEc4RJgCQMtwsxw4 vFWA== X-Gm-Message-State: ACgBeo1Tg1PZW9Mi8mlDitaFC4Sj//H19fGApnheQ1sxmDX400stvukS S0VI/Ja9tzf7btCBQc5wlOBcAA== X-Google-Smtp-Source: AA6agR7yatMybCVAV6eq1a/ttEuU5pGkfWQ/Ax4rqsdQPU57qHndrCQM9vaPSPx+yAYMTaiVpkBqYw== X-Received: by 2002:a05:600c:1d26:b0:3b4:a677:ccc9 with SMTP id l38-20020a05600c1d2600b003b4a677ccc9mr1519508wms.121.1663171196038; Wed, 14 Sep 2022 08:59:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 08/30] tests/docker: update and flatten debian-alpha-cross Date: Wed, 14 Sep 2022 16:59:28 +0100 Message-Id: <20220914155950.804707-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::331; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x331.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663172372874100002 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: <20220826172128.353798-4-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-alpha-cross.docker | 12 +++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663171995; cv=none; d=zohomail.com; s=zohoarc; b=Eqe6YCejrTfDg/r8fP8Fy2MylS//tj8xzHx4GKfq+vJ/ujda0WMDiaL8fxvkidLphavGYmUCIVxQ3fomxzbCRBN7jyOzNNApCsKPwd1UqcNX5FAetsrBevns0xEUInGx6qwCymP49/iYy79y/u8jhgGYMW4uwHWU6H4C1VH2jaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663171995; 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=IqaLr6BFu6QU3p+4N0XxulwHFk6+V+czeiV89fAmciE=; b=jZHXP7r6eMTNMB/QL5Q4SjOM7ca16ZFvKNXokruDe17AsRri54DMkZNPjwbs1hS577garsly5Xf2dvokpcsS83Gnz9G+CczFd2o1w+e9FJ0M6Uogx13JxKnburpZCoQQo/VV93yFpd6s7aX1sGgzSWmRq57wbNFF4pBw+LbkqWI= 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 1663171995838967.4617230440363; Wed, 14 Sep 2022 09:13:15 -0700 (PDT) Received: from localhost ([::1]:48918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV0j-0008BQ-KV for importer@patchew.org; Wed, 14 Sep 2022 12:13:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnw-0006Ww-2t for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:00 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:39509) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnu-0002nQ-2l for qemu-devel@nongnu.org; Wed, 14 Sep 2022 11:59:59 -0400 Received: by mail-wm1-x32c.google.com with SMTP id bg5-20020a05600c3c8500b003a7b6ae4eb2so15807204wmb.4 for ; Wed, 14 Sep 2022 08:59:57 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id d10-20020a056000114a00b002253604bbefsm14290812wrx.75.2022.09.14.08.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1C45F1FFC1; Wed, 14 Sep 2022 16:59:51 +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=IqaLr6BFu6QU3p+4N0XxulwHFk6+V+czeiV89fAmciE=; b=cyK/SugHz1QH3TSXU/J5Cq1IN/y8vABGNbMYH6vG9c5glzOcTYs7dbNyQWQ16yVGls nOeOl78cnnqkaHxOGcq9SvMVx6hZGK5qoq7XA9YsxgAM0FChKQD7WpaHzaqNjkzdrE7B WMcpGDkoXGQGqMJ+qCF3gx0T5OfshtNkfDz68uQ/v1JMrfppbEZXbWQvbNrTMV9KZliY P/6zhY34kcfQM4MiITMc2GeiKR0+oATSI6eWdcgtjSY54l+Lop3zbQHFcDpCNSvSQbox Rzv8PCDsP9a7WYrICpneb+dIfFLrMpDN/mo7hoYYQ9vhIh2vGFGJTU77EiwIRy6W67NU 5Lng== 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=IqaLr6BFu6QU3p+4N0XxulwHFk6+V+czeiV89fAmciE=; b=NWVOgeeAsHz/jSSeAcfETkIkCCghDYClxJlwacPm+WBqqiIwspHZtJDQYmCgf9pI1c 6VTd0K09oPXJn+0lyydoTOAmj0pI8BaReU3we63e/GaKQDGrFOP7cNvKcuv+hw0zgtJd r/NFFUswVD8p3oxWjOxFytYQEUYFIblnoW/T4oAUqu0kwp4le+iy01Lz604laAT5r7wa d9wxF2zv+aSnotKEdKCRM9oX2c40kmT5b+ZHN94GsXYvAJN0dSg24MoDniPuTTsxT+L4 cBejeE4b+A1tSGa5MTeZodUXX3PyBy68x2JmQpqrC8k6kUN6wOv5IVkA2usSs8MOw149 xJow== X-Gm-Message-State: ACgBeo0xLIsTt/EenTE+2x7/MKR43pq4hn2EdISR8hTd2UlCyya8/NMP LIRkpN+mh5GGyzuFLTtMRpxfzi7Pxa3RDQS0 X-Google-Smtp-Source: AA6agR6sWjTQb/7fcI8MkArGq+Zvs+gfcbP1K2A2KSkOzeOL5DukwCAYWO1jw0pIlfDVV9T3CRp7Wg== X-Received: by 2002:a05:600c:594:b0:3b4:7637:9444 with SMTP id o20-20020a05600c059400b003b476379444mr3804767wmd.52.1663171196400; Wed, 14 Sep 2022 08:59:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 09/30] tests/docker: update and flatten debian-hppa-cross Date: Wed, 14 Sep 2022 16:59:29 +0100 Message-Id: <20220914155950.804707-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::32c; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32c.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663171997784100003 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: <20220826172128.353798-5-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-hppa-cross.docker | 12 +++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663172016; cv=none; d=zohomail.com; s=zohoarc; b=SItJweRkvJIOLEW3szx1hjQkuJie6w1kS3O2OqOVJlTBqYaZZmBikX5yDufT7dtb7sKgxuRIe2yMrZIdDIvGdxn57JyB1Ij00KuzdfrDZbvf3QWUoMhyR93tOJD6Na0/xv53dDS4I3Q7VvL4anpW5hfS1mmirF+uwtGuuWV5LWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663172016; 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=qdSCb6s2r0EoqgxYjN+6ThvDdbhbHDOp2BpkY3tETSw=; b=clAi2OGgNJdsLu4RmmJxm4sLTW1bGTkjj1vUC8PfvW+EHpAc0kTeEAyFA+c2YHWW53lYJz6GJHlcmkgrL6KQdEvcmU+Npt9szlTi2X0g0Pck0zVjuTiVrhz5CG7sju7s6DiAtCJNvdwamwDqzFbaPJTh19nZOkt8fqd/8QNp9Ek= 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 1663172016812138.7135241974505; Wed, 14 Sep 2022 09:13:36 -0700 (PDT) Received: from localhost ([::1]:37026 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV14-0008KT-8G for importer@patchew.org; Wed, 14 Sep 2022 12:13:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnw-0006ZP-TO for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:01 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:36763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnv-0002nV-4m for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:00 -0400 Received: by mail-wr1-x436.google.com with SMTP id h8so19454136wrf.3 for ; Wed, 14 Sep 2022 08:59:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id z3-20020a1c4c03000000b003b49ab8ff53sm4968612wmf.8.2022.09.14.08.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3846A1FFC2; Wed, 14 Sep 2022 16:59:51 +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=qdSCb6s2r0EoqgxYjN+6ThvDdbhbHDOp2BpkY3tETSw=; b=OY+DncQw+EL/ciPldPFRoGo17xagGL67BCHtDha0832QXt0TTqFj9NmW3pj6RyNvcu O2PgE1vj+5babgSMZcKr51xIWcpwtzUu4u1QlOb3Pn1Cb3W4uLBf5lYTLoKCsw85gK1v O079B899Br1TPCEPTR0IQdyx9tg5QnsQUt2S3zebZ6TTnqqIefxlCvKL+Fl6Q6Q4Wpko OLPTABinY8Y3CyST+WSlQruBlrCyy0cqDY0khbOEm4vg3RZkbkMdxUCPQg2bvWPiDaC6 wEWF0Lg4Kb9x6he9O3z00A5I8jbwp7gVuRLRsayWOJwSgpGG8pgQuni18dy8DFG+AmxH zK5w== 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=qdSCb6s2r0EoqgxYjN+6ThvDdbhbHDOp2BpkY3tETSw=; b=Z0knjXCt/IdN/JDm6i214ir6vTgZOPJ9Rv4kYbOxls/hXBpw4dPkXfUTQyIcoIbwWS /KNGAcluSYtFl8xdKOhuUAF7AEiUtSJ3xwwJ3fKyZr+NNrSZ4UJyWjTO4UrVdgnxLqrN fY/UT8A9b0v1iFBJJE+Rz3D6YsRcSEBZFwOIbOYLdAsPWIgAm5VRyrMrXKSRdoV5NTDA oMjXuV5FZlMsqyqRF/lajBySJT9iQCNszLzeRZu81Dh3cd34ZZzajRLkEwq7yg0i2+dJ 819E7VafjhNMbSF9YILbuMfa/IK4uhfzGot2hlVPbU7BO2QIS1Pe7ouwgNCffxunEYLa aKmw== X-Gm-Message-State: ACgBeo0BW54qDycgLLEsLgWa+T2DGOasBQ9sKDipki2wdVzOrloyfSrl hamjRzSJdpd9XniUyxh/f9P40A== X-Google-Smtp-Source: AA6agR64Y1f4DfqnnpJDIe02nz89sKON1nBc+XTVXAusiSAlRSNfRrPfu1+mIV7Kfhpp3pHnqqt6qg== X-Received: by 2002:adf:d088:0:b0:228:a789:ce1f with SMTP id y8-20020adfd088000000b00228a789ce1fmr21108077wrh.461.1663171196785; Wed, 14 Sep 2022 08:59:56 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 10/30] tests/docker: update and flatten debian-m68k-cross Date: Wed, 14 Sep 2022 16:59:30 +0100 Message-Id: <20220914155950.804707-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663172017855100001 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: <20220826172128.353798-6-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-m68k-cross.docker | 12 +++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663174530; cv=none; d=zohomail.com; s=zohoarc; b=ODE6GtCmFZOpeXgEHPBOizK9AXpckc5S3ahYRQapNU4ZfDQLWDgT4ytf/1c8sckLOeXgjowGzne3Kr1KfLQCEpYvz3uTMdO4Ql4AmZU9x5Tnoi33fJ6USDs+e78c33P2nesVpqp8RfAkHqMji+hd8rmYFqh0DnZa33z7Ch+sduY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663174530; 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=U2JzAVOHBmx2p6Y9jlhkKfmMcAlVs01DcSLL5ELzwk4=; b=Egp67SFcVdfdnOYtunjAmvUGaoJyLZPvH1TtDPkt4d/PymT4G+xh3Gi0qZTcDZRjhc+FtpFUPT+u0PjO/OCCkumnHoa1C0cZRSXMObsGNLEjjIy8bkY64dvcL2U3rrXLDptCGO/0/L2ByEzv6QAt08QsUoRoT6NkQE9U5O9GMhw= 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 1663174530095817.2134248037872; Wed, 14 Sep 2022 09:55:30 -0700 (PDT) Received: from localhost ([::1]:48438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVfb-0000yE-Ux for importer@patchew.org; Wed, 14 Sep 2022 12:55:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUty-0001Nu-ID for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:14 -0400 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]:46749) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUtv-0003qX-MM for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:13 -0400 Received: by mail-wm1-x336.google.com with SMTP id n40-20020a05600c3ba800b003b49aefc35fso2608479wms.5 for ; Wed, 14 Sep 2022 09:06:11 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g1-20020a056000118100b0022a2f4fa042sm13552376wrx.103.2022.09.14.09.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 486AA1FFC3; Wed, 14 Sep 2022 16:59:51 +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=U2JzAVOHBmx2p6Y9jlhkKfmMcAlVs01DcSLL5ELzwk4=; b=QizJrc6mW/B4qufDDSvFmkWDvaCy8AN3qyuKGfZpdae4dtFKhBV6r2/c7v2Y1bSML5 RZyd6BbkxhRTEv7EyPzCbOv5k4GvGLGlt6HcsELR/WGscbMigT63pmfHpc+ti1uamqQP dO3119gojy+JZwSKE9TO66MHI6rbOGVOjorWrRI6ll4uPbFHp8IaNXioz4PtdpTUrw5s Y7OzhiY76NyW1oVmKsa8Hra9b9SQAUMcXv+BQw50G18OysczYmojRxMkzcuGfdzYgiKn N83520PGrh+5iptYpNDqmoPyWh2QPWxxTa6bPIvcTz01QtiouGEFbyMVm+tpczEW5A1s 9wSQ== 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=U2JzAVOHBmx2p6Y9jlhkKfmMcAlVs01DcSLL5ELzwk4=; b=Bv2RGGAXoKYAXTuCkwwsM5AgpCGxUAqQF8NI5fNVxZPEDUnU4VAks5ir/Q/7I/LEJD hmuKGTddCeL0G5oR9EGQbeP5SQngym8qLHWxm49cvx6N/aiWyntYB0rV9H+E0L5phtWZ U1MjzTVMiWvPtS3sGtLwKclOG7CsiOtPFA1Vqb/jj52Zoyy3lPi3PH0v0ZJZ9FdBHMtO FN0jN7rvDIN/tbBSXvV5yoBRqZ21S9vcNMrgyaNnD+jcCDoU+riVTLLAw+teuvaGYShf vt9cfw+r5Qp1Nzb+YdeV1e5B3FzbB8PiCkwm8HmCUCxnzjzds3ooRYq1jJk9XhKGqIkV QgOQ== X-Gm-Message-State: ACgBeo0l2oKnhCDJF48mzXoV2wXOFqAfLUrNh+mv15RNRWAEQ3gVBvtD QVDLZpU+XYB5mpUgXGs2j4RSxQ== X-Google-Smtp-Source: AA6agR4wFGT3H6n2JHqEvbM1JuxLo0bqwdzyY8m/SFMgZ3+AD3yAl/mpKAl59pXeSKZIph2fHhG0hA== X-Received: by 2002:a05:600c:4f89:b0:3b4:a6fc:89e5 with SMTP id n9-20020a05600c4f8900b003b4a6fc89e5mr744104wmq.149.1663171569997; Wed, 14 Sep 2022 09:06:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 11/30] tests/docker: update and flatten debian-mips64-cross Date: Wed, 14 Sep 2022 16:59:31 +0100 Message-Id: <20220914155950.804707-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::336; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x336.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663174530360100001 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: <20220826172128.353798-7-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-mips64-cross.docker | 12 +++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663172420; cv=none; d=zohomail.com; s=zohoarc; b=f0rSSR7TRUfsptka7ZW85NnVb3jCwes6GD4Vm1Ft8VXTqa2hTFBXyM816DV6brLd3pkWc0KHcAjiWnCquG3jzuPRpxfiTVtF0YHobT7Qb3kS42ozHwURN85o92CyUy8zBy5ZeHQlAnIN7Mq64ssjpB/Y6PLxo3Ek5zTU+fBIDGY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663172420; 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=MGW8Qx1J0PF0RJwo76xRbma2CeONhBpz+sH8ADGaVWQ=; b=AXOJyGWg2zWZrbHC9bNw8a1OYCrsOp41ecDiVtrHaBLNaHgJ2znYk/C1MfKP6RG4KrJ6o7G51R2Ijm7Pu226/2By2iLETaGL0OWyO7wz893HTANJFVwU8Z9YnfkyC69rbiZ+MFSVnoSosf+Bf7R3rEXPwJNKQS6OHODW2xku3bU= 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 166317242070235.84006569779342; Wed, 14 Sep 2022 09:20:20 -0700 (PDT) Received: from localhost ([::1]:36060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV7a-00069V-5S for importer@patchew.org; Wed, 14 Sep 2022 12:20:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnw-0006Xb-Aj for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:00 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:40938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnu-0002nc-Jc for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:00 -0400 Received: by mail-wr1-x429.google.com with SMTP id e16so26442494wrx.7 for ; Wed, 14 Sep 2022 08:59:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id id11-20020a05600ca18b00b003b332a7b898sm17207403wmb.45.2022.09.14.08.59.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:54 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 644B81FFC4; Wed, 14 Sep 2022 16:59:51 +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=MGW8Qx1J0PF0RJwo76xRbma2CeONhBpz+sH8ADGaVWQ=; b=T/mxWEfU+k0ggsEs9j+Qff0UnLhnysiQ/tNPwr4KYXWA+0YJfRDidXhrx8og9hqIFc zu951AjFZNanT99iiciTbUdqTjBzIwJrIYGpv19p4p3djPxvNPLdaknAlq4hiMw/PKYe tvO3TU/wIjfKwIPettTjSdethmsoldlJUfdY4e8A5sfYHBBTxJBAiOpPXUb4cUobWTU6 xad23hS3u6YQxjakH7rhH/wLtGgXJ6DvZG3CQhLf4sEcDqobODF2jIffDeJOmbSusrLs NnDXpTEVjG4SmDDnu7VqUoE/3tmeuijeXHMRvaO6wu4roCy+Z/wVxvEYEtuJTtdcoxdY J0Mg== 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=MGW8Qx1J0PF0RJwo76xRbma2CeONhBpz+sH8ADGaVWQ=; b=3/AhuDeN4llOGkLndPyI21I8R/HVTggpHgXScXTTsj/hxbH470GhdbbM/zOOfh6dGj jBTl8mTqbWjucdQhAU1dhWk+OI6DXd45YW51f9fwRR5htaJ77wH4KswX/o+hVXBj2fxR WRfXhsl7qWNhHnu1wHKkM037bISBFbMiOSfv1Qk0WjrUCcLCNfF5oD1596ki0nGUQnsV QuB2Anx3ICqMu+PZ5fzA/AKopynLSepGs0aRtayTpnyETjYVm/uV/VpPmup6YyZMBv4r 0cF1f93GWeaNxRpr2JEw/ZwqtF6wITMunaBhvlwL5K2pN8fa/iWriIs1eHauhFx03qEK enkg== X-Gm-Message-State: ACgBeo1WJzNmj944qt1Y3L1b27TqKEYka5D49FDeSZQZwWEch2nU8JuQ rc8QiZS8YofQhbtocMIhJd7sZA== X-Google-Smtp-Source: AA6agR5OiGcn7BYXY8crtBi+glmKiAG7ztX/z7V3PRFBGsQPehut85rKpSpqwZUphL6BhehC4RFf5Q== X-Received: by 2002:adf:fa82:0:b0:228:6122:9903 with SMTP id h2-20020adffa82000000b0022861229903mr21846137wrr.144.1663171197247; Wed, 14 Sep 2022 08:59:57 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 12/30] tests/docker: update and flatten debian-sh4-cross Date: Wed, 14 Sep 2022 16:59:32 +0100 Message-Id: <20220914155950.804707-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663172422897100001 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: <20220826172128.353798-8-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-sh4-cross.docker | 12 +++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663172833; cv=none; d=zohomail.com; s=zohoarc; b=PwUw8YM3dKFEIMTyeC6E2PFPRUXcZuj/sueMFsRGrkVSEqByoACfCX1KawucAkLjPWX0B2yb2vNuyxipVcfZX4J7+0X6jk//Dl3OB6Ty2a1be3mNSCZk434+2nG0TJbHZcbAeXR1vVQkkWnPpafXuKo7R/4sgMdvnFWNdYyQ+jA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663172833; 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=b37tM16YW2hM4J2q/2/cHZ/O4ghItjIzNOwocMzl0HY=; b=IqTWUNAVX3OsH7LtJs+ZuFEP61BklqUAj3z+cp5YiIPx6WcSEaD/mHZZEKLsWFDbsUzO/1Pd9WfwGbro66OgrfY09DZJ8t6tel444uXHaLeX1HlV5jZAsiVIxpT5CmKxP2FMDHtCBJ8eA+u1Kkzg3Y/TwiiXe9/+xopFbDaH6Gk= 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 1663172833771373.40183201191667; Wed, 14 Sep 2022 09:27:13 -0700 (PDT) Received: from localhost ([::1]:54204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVEG-0003by-2b for importer@patchew.org; Wed, 14 Sep 2022 12:27:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUny-0006cI-Sf for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:02 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:45957) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnx-0002or-0D for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:02 -0400 Received: by mail-wr1-x432.google.com with SMTP id bj14so26394903wrb.12 for ; Wed, 14 Sep 2022 09:00:00 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id f10-20020a05600c4e8a00b003b31fc77407sm20128857wmq.30.2022.09.14.08.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7EBC11FFC5; Wed, 14 Sep 2022 16:59:51 +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=b37tM16YW2hM4J2q/2/cHZ/O4ghItjIzNOwocMzl0HY=; b=Zi+DQhoSm/INAb+dWyd9jb6OshLkQ7zt3ksZPsRE+15i5y5gTza5H1jOBc7LpWVTFS 7EOEzKBmcFyutxLtiUHRXmyP3evhlRpfwDs8tbVbs1SLBFOVtO64mQIEf/eUi15BFzOr 59Q1VItBwgvXeB7eRJ2sMPfxlR2Ye/4fytD/vp22eym9FZvctY6rQ+NU24guN2w4CwMZ afgJFg4Ve3zvhPg2S9cwfTAqs+w8A2LHHV3o8KwCLmbIOMq7qej4v1HSdH7Zc/Yr+QyV K9k6/R+JANqz+ryjB8vxBvcKnECVHtViLlBmVbgwBW5JIeAJ4vTbtoPd4fZD5vDtRqHp Czvw== 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=b37tM16YW2hM4J2q/2/cHZ/O4ghItjIzNOwocMzl0HY=; b=FbetOC/ms4BHl9dXt5XQmLLKux7OrOVq/yCS5V8j8u7rCzvfr/EfrnD9KkCkPrmpQx ojW/D23ZT0HcYCuUSS1kmL5YTqez46WrZPDBZLk8PAobrUvblhEWxMRBQn7a+kTw8BTe Jz6QqmedJSRdCRsyHQ2AmWjFpOuYM+yueFFwtgujsyMURt4Z8o9ErR+KyyVkB5RUcue/ bDfLRz47ksNPPQRSSWq9033mckhTLLqeav+1CAdX269cvtku+JfTSej7jocjZrR3dPBe Q1zQVoPxuPztsnmlLYngcF0EvcgosPBOVUhPfaOyFRVI5g0uydujTaVKFi47sdkLsMX6 JMfA== X-Gm-Message-State: ACgBeo0jklDChBKhFyf6A+wH277VoZYTvpdJHnc9J7HQpBCkPBU0jOot o187j3iE0gjpLjrREIvhtfHlkA== X-Google-Smtp-Source: AA6agR6wblAMBg+noLYndemPMFVJMmBp0T/R2+7l/FceicAAobgNWIPVQSNBQMKQt91TTAY25Gk93A== X-Received: by 2002:a05:6000:1d8b:b0:22a:c046:946d with SMTP id bk11-20020a0560001d8b00b0022ac046946dmr5398549wrb.249.1663171199647; Wed, 14 Sep 2022 08:59:59 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 13/30] tests/docker: update and flatten debian-sparc64-cross Date: Wed, 14 Sep 2022 16:59:33 +0100 Message-Id: <20220914155950.804707-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663172836032100001 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: <20220826172128.353798-9-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-sparc64-cross.docker | 12 +++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663172948; cv=none; d=zohomail.com; s=zohoarc; b=jHBQERgxRfe7uPGK+m494aCg5ZiNswrZ7jg5Zb4+RGUqr+MDbYR7yVVbap5Cmn4ITOyNYhQZpQsPb6Btk0ArmRaaKZJXZzvfJdP9dsbS0RdIBFrsjcJDGDnbw9k0DYrC9ga9fH7aAh1YUVjmgir7N/9LVQEn3Y1jQIPiM8N/pZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663172948; 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=3e20V6KO3fnSe6hV5y58MKOdP3MKisUIItuiv04/Bkk=; b=QEXgdINRfMVXy9+oyQ0xz6FTWS7VS+dZ8JGf2J7lUIK64fKTbJrbg7+qFCYbgrIXb9UOr1CtZeXX1qlJDq1xT+31g6KKiN5vxBwEk2hLI3T2RL6Og39lw68pGv2mGAOYkfOmseNedsqazA/1BNPWdMkBbd4XAvjNQ7FmCiqrWiw= 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 166317294823140.52523173610882; Wed, 14 Sep 2022 09:29:08 -0700 (PDT) Received: from localhost ([::1]:54820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVG6-0005nS-W3 for importer@patchew.org; Wed, 14 Sep 2022 12:29:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnx-0006ac-FR for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:01 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:33783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnv-0002mB-73 for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:01 -0400 Received: by mail-wr1-x42c.google.com with SMTP id k9so26487989wri.0 for ; Wed, 14 Sep 2022 08:59:58 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t17-20020a5d5351000000b0022abcc1e3cesm6013027wrv.116.2022.09.14.08.59.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B0161FFC6; Wed, 14 Sep 2022 16:59:51 +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=3e20V6KO3fnSe6hV5y58MKOdP3MKisUIItuiv04/Bkk=; b=wov5x4qyCV9JC18Yg46LbF8lwsWAkuXWB0zHtJ+DZOgh5LcDA4lJIZSlZMXGvutjT6 bRDymU17TIcdxpCX6PYQPnvzkUeJfOXb8oauFnbJbSzbmn2dr0i8XVfhJF8lNB8zNsTf ZA+aTel1ns3n+ov6S5iC86Z0bhyuqIR8ndo71UCeAG7bjAcq38WrSHRxYBhfzV6DVn+f JaNnpsr+0nMG89InvIt+VItIznViiIya3r+HQCXsSU+x2so+2bYYgvFtz6et0UP2bimj 45+rssD5mB6RYdq46xVQEACDFE5s0nmDbQN3FBOjxwp6Y9ogHzz8gR9bF1/e9jAwAW+t JWCw== 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=3e20V6KO3fnSe6hV5y58MKOdP3MKisUIItuiv04/Bkk=; b=Vjqwd27EcIJyLeyfHKw/gYMohdcviCaJHP20Ty4cEj3UOfCuSs6fONpZkUEtsn6jrZ VX4wjvdYlCY0lQyrpGY6pQQaknNEkfl9rDMX6PIqmvbrgOkYwkdA8mRw4SJvadSLk5OO elyjJKcdQP6L8Gk1kBRUYrC5e9IlONuamigzt3QkU1Ok7DK1T6ORomPvpmNblZj/mwd5 LHon0cdRqvPTe/P98Fol0FbamHlF///zg0E9zwnb7Rnjqi3J33t7Q1UopufVtkmCwRvd Slxvj2tH6AaNGWO5qwabUNOhD9IqU4S8RtUKMKoIbKiuk/WrM8Tqwee3DLvr8O73RSiI e6Tw== X-Gm-Message-State: ACgBeo3nhR/f9xHES2sMCxB3rpfR73XlER68thqeLYslNvkxLPZUpKtX a/MjQd8dFIX+0ZOn89kdg+phRg== X-Google-Smtp-Source: AA6agR4h5fh24RWaqsqr9QW/sfy2i/urZrch7tTvmiadmXPN/ALaOcx0saC96RX2w9mS60/SFl7eSg== X-Received: by 2002:a05:6000:1683:b0:22a:53cd:39cd with SMTP id y3-20020a056000168300b0022a53cd39cdmr12606577wrd.55.1663171198465; Wed, 14 Sep 2022 08:59:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 14/30] tests/docker: flatten debian-powerpc-test-cross Date: Wed, 14 Sep 2022 16:59:34 +0100 Message-Id: <20220914155950.804707-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::42c; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42c.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663172949327100001 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: <20220826172128.353798-10-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - .../dockerfiles/debian-powerpc-test-cross.docker | 12 +++++++----- 3 files changed, 7 insertions(+), 7 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663173398; cv=none; d=zohomail.com; s=zohoarc; b=hNVtvQoHMsRUdZfIw9vpplBBTRehwk77kmz8/PI3YhARt3SERu0FhVN0I4AyOX0bGZDN7Jo3XhGN9ekUh7bEMZYUyrqeCHXH/cej1EIfaI16xHoz9eq6jXfbo5g2AYhbeBt1Vu4+7NudDCS+1dNa7+VHh4py1TpbWaXzeVe/6TM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663173398; 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=Kz7cAUufaTnZbTesKWGFYDQNhU7/ZM8fW5VV1gae+ts=; b=kkiihilLePN8RIvFrNQGdfIdHcu2Ja6JZIow/6N2g5c0Ok6rK0eteacP27Hcn5zaCl0/fpcCkrNt3T1G3KXNEtHg8koNCHGEE3Aszqwy3v0cLKJa6mqVNLentW/7pDLhTm2vYIRQh9R+2Ra0WTYDn13JW0knj+pEANjhswIB+hg= 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 1663173398449464.46513315702043; Wed, 14 Sep 2022 09:36:38 -0700 (PDT) Received: from localhost ([::1]:56268 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVNM-0003JR-LV for importer@patchew.org; Wed, 14 Sep 2022 12:36:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUnz-0006ct-C8 for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:03 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:37411) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnx-0002p7-H7 for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:03 -0400 Received: by mail-wr1-x42a.google.com with SMTP id bq9so26452623wrb.4 for ; Wed, 14 Sep 2022 09:00:00 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id g5-20020a5d4885000000b00228de58ae2bsm13850145wrq.12.2022.09.14.08.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B5CBD1FFC7; Wed, 14 Sep 2022 16:59:51 +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=Kz7cAUufaTnZbTesKWGFYDQNhU7/ZM8fW5VV1gae+ts=; b=SeIErpG0KLQqEWuB1JnDDhKD+LnBtPvYeWmsn/XBKpkpOwy7sLEMH7rrcWuRaCcuWT YEeCdo1IcnOxHnavTJo75HZIWe29qVdcic3REe0gckGM6ucqgJOSchsrwvGkRbVLjSwC m86+ZqTbshGUYMTHntuuSokFxXb3x0x5cqdRDpkvY90seLnMPVbR867AMIIE3Zedp1jF F4+nX1FAyKjtuOxULz75TdgS+YBPTBEJ6pbog6RG7/TImCKomqrxPoq0X+dACJKHnaGR N36HzSXwJ0B1gr6UF78ZBEWf0pZSorg4Z0wbVS7P90sC7I73aMYeSe/c1fZsK7kWRNM7 0J+w== 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=Kz7cAUufaTnZbTesKWGFYDQNhU7/ZM8fW5VV1gae+ts=; b=oyYV2BmM0geV//eDXOucd9fYgX3UKOg/lCI7B/2wvzUDLzqbiBTNaWv4zQ/tAtqDTy 4i+Bx3+pwONgr4QLatxptCDkco6S310da26LedRLecN90JA1fGayjdEuOibc1lSjESzE 48qxYr3OwDJe9Sbt3EY+p4pmscnFDl5YFD/+uNcPAxw3mtdA7Mpweq3lW1O3qCiXsgLC KQgm++BbbUWT9keCuRQunPORqFEwad0YVkW6vyFlIvh7dPQWXG71bws7W39/oA8d0JOo 1HWQMfdgrHVJkfvfj4dCBxwMIjVpdY+5SL4pd6Qb1fYdLtMYLDBsd0pMvteCrgiXVBWD 2CqQ== X-Gm-Message-State: ACgBeo2KDNdOFFb6m85RpDb+0KP6xOjNtwYjL4WFSWYc0LjKl7AqJi6V 0K8moIy82mobFy9mV866QH4k0w== X-Google-Smtp-Source: AA6agR4P72APSVLksXA4Au90Zt1NFJc705ZnqZKMkU0QsMyxvhyB8FKCHApAmJ66Qin2xNKGuYEa9A== X-Received: by 2002:a5d:5888:0:b0:22a:72a1:5140 with SMTP id n8-20020a5d5888000000b0022a72a15140mr10695521wrf.408.1663171200076; Wed, 14 Sep 2022 09:00:00 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 15/30] tests/docker: remove tricore qemu/debian10 dependency Date: Wed, 14 Sep 2022 16:59:35 +0100 Message-Id: <20220914155950.804707-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663173399418100001 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 Fixes: 39ce923732 ("gitlab: enable a very minimal build with the tricore c= ontainer") Message-Id: <20220826172128.353798-11-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - 2 files changed, 2 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663172380; cv=none; d=zohomail.com; s=zohoarc; b=kH7RAG0JudOIhIuVutJ2qKOpg7QfDiZfnzvRaRpCZNNpYlXCsBTTrC5JlyGQB85A4vr9UnF2UwFW477PkGxsLp+j4C84WfniR/uq1BX7wQWgjNJb2xguzkbBaIT6bORHAyermEWVqNCkoYcI0zQLpbk1CJRDocp/xEnzyzPcwsk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663172380; 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=1H7BYOsMjX27yWey90pXEdizOhBIsoyHQ4lOXwgMOZo=; b=jA2LOZzKLh1G9xwMOm3tltl29bpvS0b2+Dx6txnUb9lfYOVpzXz9GmF3ElLC9Vg/VWRbFtPqCSamkA/QAszykt/Rjrt4LNuy41+KotQTZrSd1nUq+fZlTLaHYQrM87uoFGe8+7Qts5+hFwPtvyz1URBahK+kfMP8jojdC3CjQgc= 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 166317238070995.73879978089474; Wed, 14 Sep 2022 09:19:40 -0700 (PDT) Received: from localhost ([::1]:35508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV6w-0005wp-EN for importer@patchew.org; Wed, 14 Sep 2022 12:19:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUny-0006bE-3I for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:02 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:40944) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnw-0002oe-AG for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:01 -0400 Received: by mail-wr1-x42f.google.com with SMTP id e16so26442594wrx.7 for ; Wed, 14 Sep 2022 08:59:59 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id q3-20020a05600000c300b00228d6edade0sm13627274wrx.46.2022.09.14.08.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C111F1FFC8; Wed, 14 Sep 2022 16:59:51 +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=1H7BYOsMjX27yWey90pXEdizOhBIsoyHQ4lOXwgMOZo=; b=lqxovLHueUOkrLTmPhKjzEtDaY97Kz7z5xyMb9yy1hWILL8X844ObS1ZTRbD59A1yO ebNRY3MXdaLcGx/mZINEf+dXclke5UiRT4LhYimELouuaLAVWrCFCpPu2XnrNhghtk24 EC4e/YZsRoMP/JSnGu1qWTAvYSG3YrMqmEV4zSw40DuAiM0gezSoPvlfIDKccsplr5Or PPzEf54AerIM3iYv54p9Sx8aSdEDhW0CNDGoaFK68v4acXCi6xSfl7cOCxIMyDnFhCqt Jm71XNF8qZCuBUDDC3X7xzVN5Hf74kxE2/zvWTe8u+P0tu7T+34q4oKLZw/E6g8T+ZFn LJiQ== 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=1H7BYOsMjX27yWey90pXEdizOhBIsoyHQ4lOXwgMOZo=; b=d/JL+7T2UhZWaB5OTz88VsJjXfITq3smRAPFGh3p3XZWKv6ClXsAwiJS4dX6hN9SpN ByJfdlfn798JuGl/Rb+YL7UUck6GHSSHwl11ObqI238s5ftzwEPgWaioAy+hkTYa50J0 sXOrOcgnNObq24rV03cuyJZsuHodP/HEQuQQT28ZR2IFs/B2KD6OkTkkKjfeEzjYA4aE ++JY5Wneyzyx48deRtbjccRpOchpYiyPjxIZCdIK5Hrw20lyYt8wbTMvrBNnfQI4ECHm Gr8rLhsQI6Obv3VObI4DoeFTcvqoOjY2oDUW6sFjCSWOaf+fsCUKjEHhzMPe7R5aAkKy MfHQ== X-Gm-Message-State: ACgBeo3IDSLAc8g6Mku6W5N4eTNoOFXGwfuoXTz7GSuWTLSnrU41svBj FiaMhO5U14no9ZihwFYtNnVZF6qZACPp7tm3 X-Google-Smtp-Source: AA6agR5sDFMbFCHpLC6MzzVHqGB9O8TlJroRxI6DmXF80DejfbUTU7KXF+O+u9Sah3VogRtl+4NQbg== X-Received: by 2002:a5d:4dd1:0:b0:228:e3c3:67a with SMTP id f17-20020a5d4dd1000000b00228e3c3067amr21878894wru.411.1663171198789; Wed, 14 Sep 2022 08:59:58 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 16/30] tests/docker: remove amd64 qemu/debian10 dependency Date: Wed, 14 Sep 2022 16:59:36 +0100 Message-Id: <20220914155950.804707-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663172382621100001 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: <20220826172128.353798-12-alex.bennee@linaro.org> --- tests/docker/Makefile.include | 1 - 1 file changed, 1 deletion(-) 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 Mon Feb 9 16:21:41 2026 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=1663173177; cv=none; d=zohomail.com; s=zohoarc; b=Mu/TBOuz4mbNLJfEAUqWsZcniVUn/cm0lVt0sYkdtPh9mG/Gh9+meJaLOh7MniFVzT0Sc+3AnzGckLMMxDjGQfh/UILPbupJ7SSbL2cFlqX8m6Ev+qFXKgnzk19SSBYw70QFzd4zET7R4e3T9S9b1fOXgUW9zbuP9aG+3WQB5ac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663173177; 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=RABVHmGwM4Y3Zb4Tdf8GWAG2GTowADZu9ETtNAlNjQA=; b=XTfWuw4VHTm0ehk8fvqoS6vLboduLI/jm9cT7N2s7y34xD69NbP+GbhoTgcw2FLKHd3ppTadKQFL4RsB2udBtFHa04Uo8qpun/W1SgguNdbjGIdRFbC/dux9+KQB6/srkUj2skrGqhZwy1BGadVX40v/lS0dmvWWBoZpuOWH9PU= 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 1663173177604477.02829218373074; Wed, 14 Sep 2022 09:32:57 -0700 (PDT) Received: from localhost ([::1]:38192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVJn-0001Ck-NA for importer@patchew.org; Wed, 14 Sep 2022 12:32:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUo1-0006hE-U0 for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:05 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:45951) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUnz-0002qO-GD for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:05 -0400 Received: by mail-wm1-x334.google.com with SMTP id bd26-20020a05600c1f1a00b003a5e82a6474so11845491wmb.4 for ; Wed, 14 Sep 2022 09:00:02 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id z17-20020a5d4d11000000b0021db7b0162esm13572172wrt.105.2022.09.14.08.59.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 08:59:57 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D9BAE1FFC9; Wed, 14 Sep 2022 16:59:51 +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=RABVHmGwM4Y3Zb4Tdf8GWAG2GTowADZu9ETtNAlNjQA=; b=MLlokei46fQaUSLqNpHgR/MnIwfXozoz1sCJWRYhVpBhtLlDzoekSZy4kxKlmhQtu0 rrXfqQ1NE1NMiU5F/DHbL5P9opDmiEnCpZrdPEe2zcxwMK2rC/jtf2V2khv9zunCTurJ cSJx+8/gXEGnpwwXYWBjpPqNWBqrBUmdacnKztilPHJzbQTybrk0sokx2w9YO8Wa2cRg H4HUaZ/09HkdbP5zskf1smME2tT1WoonYx3TPYYpjH1aHsmeOkj2F2OJe9xh9/YkPN6f k8e0DBfF8MiUDcK920/4WbfRfB9DfiaMgFb74byxO4vHscfbU9hpTEU5onrNqSMBG9YV PlHw== 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=RABVHmGwM4Y3Zb4Tdf8GWAG2GTowADZu9ETtNAlNjQA=; b=7HgbcjmnkYWLFfbHhdDr55xBNax9YsI4oRvCJYYPVPTAsC1cVXwjIUSknHUm/bjJyg 7TCavHKhRCUXpehgVYmc7aKj+8obKdk17LDZwIgSlg1wjxRs8YXUWLMpRFt4kx28EcFQ Ho5Ra66aFVF/63NQCnN+1wZRyKgUMRvgwFy0IvGGb7ZPyj+G4rMs3EIZreqq/vUk2vDi 6U+INW9JrmMNoTMvCN99plHfieS63WW6y8Z3P3bHHuHxqmpeS2KouREohGFveQQ5iW6i Htq8NLVG/S5tG7D1yEnGTrl+GxpO2G1vZX+pG9IcRyoKsGbTdV9Kjg9JJKqeJLIEma+L qCrQ== X-Gm-Message-State: ACgBeo39egFbXW8m4D+I0MdniDtCKfOMoOHF7hwQmHLgUMB6eyi7gE68 FhrpU4IQibC4hkfEhEhC9spVyw== X-Google-Smtp-Source: AA6agR4f3XnpMDCslZv3UadWKunkFrpooRX2ARBOnih9t0aWau+U4tmVbDKXMS5sNTt9tQjHgxvVwA== X-Received: by 2002:a05:600c:1da8:b0:3b4:8fd6:5132 with SMTP id p40-20020a05600c1da800b003b48fd65132mr3622557wms.99.1663171201503; Wed, 14 Sep 2022 09:00:01 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Thomas Huth , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 17/30] tests/vm: Remove obsolete Fedora VM test Date: Wed, 14 Sep 2022 16:59:37 +0100 Message-Id: <20220914155950.804707-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663173180005100001 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: <20220826172128.353798-13-alex.bennee@linaro.org> --- tests/vm/Makefile.include | 3 +- tests/vm/fedora | 190 -------------------------------------- 2 files changed, 1 insertion(+), 192 deletions(-) delete mode 100755 tests/vm/fedora 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 Mon Feb 9 16:21:41 2026 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=1663175121; cv=none; d=zohomail.com; s=zohoarc; b=nHYtBboZXth0E0WzhHujzmJjstCck5DBM8Qhc0pJSHGFPqJfomW7Mw1ILAUbiqaxvu5+zhjXg4LcBXria0HOy0MzxMf/HZqONT0tIJyAYYrMshCPrwe0W1aOTobAp+mCpVMEnvzHsuyHKR0xo578Nikp/FinWUYXhcyVQOsQuGc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663175121; 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=QTQr9TtcMW+CLdYuqmZS0eZEFv1TYRf+0Q4Vht/BZfk=; b=b141Cz5Ei2QiW/WJtdThS5Sv2Sl0U8/DPn2t8jGQVQa/eidrDdY5aCwpp2QfuQM7c8nOWMK5xmAtSl5dU3gjFWNXaOMIHn5doiN/i7+wd3XFtjHe67GNE3e8Np/EL8/v5vR0h/NbMBQ0lmiGUCNdVM//j/WpWxgLRVUbfS7DlWE= 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 1663175121962230.4292811513394; Wed, 14 Sep 2022 10:05:21 -0700 (PDT) Received: from localhost ([::1]:51548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVpA-0004wX-BN for importer@patchew.org; Wed, 14 Sep 2022 13:05:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu0-0001Qm-2q for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:16 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:42935) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUty-0003r7-Ek for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:15 -0400 Received: by mail-wr1-x434.google.com with SMTP id z12so8147361wrp.9 for ; Wed, 14 Sep 2022 09:06:14 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id o14-20020a5d684e000000b002287d99b455sm13638515wrw.15.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EEFFB1FFCA; Wed, 14 Sep 2022 16:59:51 +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=QTQr9TtcMW+CLdYuqmZS0eZEFv1TYRf+0Q4Vht/BZfk=; b=Vn/onk6+J4j0X27Fgz2iYgN5LSNypw6UWZ+8Ebq6LgU9fp27xi+8fDaKlloxEqWuEg DXzNiKVZbFCCzs9BY3ueO08AKnynDgMWoUcFit78uPQYyiUaKAebVW+bxyWRPV9gQwSI 7I/TL70LoF/e+cVQGA88tvUenSazwZyLjIoQ9rMXnfBI3NLVDtA074cKbnvdag+3QIdY KDg0PGpMAI9Twzb51Q/by3/1qqNqoZRRdXU6B54crDOqRD2BI2u23buQhb7GIBSB/coS pg8YLVks4XqTYHTUhwV7PmloT3lcOT9DOth63Y6fSbf6Kp6oDbYRZsoqrhOvCcDq/GuQ uaXg== 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=QTQr9TtcMW+CLdYuqmZS0eZEFv1TYRf+0Q4Vht/BZfk=; b=zMOJ7ZgqwM01ORdFT72F1B+fh51xU712YEjbafSAv494oPEkCWg/yjakfdkuLWaFnj Sxksz7Hnt1GXO2ymFgOr7M+WMnOgZkzLcvxP0yGTDJtsXQm/m+SQzHAnCIaf/au+uXJj y4pI0NhPsDhxbK/fn87FZocKdylCyfwwfUUdM5GAp10DlM6k9Fjuw5yCDX1VfjYVwuqJ 8UjmcwUnAE8w61/luueBo6vRKA/vOOSyOYDVQUBHD1weQJ38+18KWak8hEbj14cWW2x5 OY8Nt0sU9znrx5Q4iC3RGvXu1Sxd2fwpfZzTPZfN1cC+4cgwEuYNWMRezxn+bnbS3egb I4gA== X-Gm-Message-State: ACgBeo2M53Cp/Ts5Ze6fsrs0lEAEcuHqxEIU8JyWUnhaIa7AfxjYm3Da x1A83H3LfkQSw0XiwY/T4oP+wg== X-Google-Smtp-Source: AA6agR5JOQJMROHxyttdtf8iHPAOCi7t10RfSvQdLDJbUg2HfuJiXzAx3TPd6f60kCdMnb0LppFFNQ== X-Received: by 2002:a05:6000:1d9d:b0:22a:745b:9f00 with SMTP id bk29-20020a0560001d9d00b0022a745b9f00mr10579090wrb.280.1663171572977; Wed, 14 Sep 2022 09:06:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v2 18/30] configure: explicitly set cflags for --disable-pie Date: Wed, 14 Sep 2022 16:59:38 +0100 Message-Id: <20220914155950.804707-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663175125195100001 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 --- configure | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure b/configure index 575dde1c1f..6c169b23b5 100755 --- a/configure +++ b/configure @@ -1394,6 +1394,12 @@ else pie=3D"no" fi =20 +# 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. +if test "$pie" =3D "no"; then + QEMU_CFLAGS=3D"-fno-pie -no-pie $QEMU_CFLAGS" +fi + # Detect support for PT_GNU_RELRO + DT_BIND_NOW. # The combination is known as "full relro", because .got.plt is read-only = too. if compile_prog "" "-Wl,-z,relro -Wl,-z,now" ; then --=20 2.34.1 From nobody Mon Feb 9 16:21:41 2026 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=1663173622; cv=none; d=zohomail.com; s=zohoarc; b=XNW27Vr77N2ZFpVP7dLuEdoyOaunzaKxRe+vUhlAMlaVmSvwOJghNB/YSXjyw0UTu1EfqH1yINlA6oihfb0SR8PdaGTgmL7A9je3Klj/6L7WSqeJImkTQJv4L1aaxf7K9fQvpKqqifef2F8Zr6tREsvfdqmlWWHPQSp/FOfrBLI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663173622; 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=YtututB/HwLz66Zj57eTsQrfGdUZAAhyrcZh+dfp8lg=; b=dqXzmlbE0iwbz+c0Gs0Z8XlLDugZEUUYB7YeOiRhqmo2cF4Pnf2v2FkTgSdPJt5VgrJMn7U6VeOyxDNKWi+8/gbeyg+AyLFL8NJxam4wBtYbeNTAIkoXuJpuzIDHzT7/+YafgOrHGvDjd05xOkVzLZx9KQvCy36neV+BPUeIe5k= 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 1663173622492646.4910569340971; Wed, 14 Sep 2022 09:40:22 -0700 (PDT) Received: from localhost ([::1]:41332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVQy-0007ic-2H for importer@patchew.org; Wed, 14 Sep 2022 12:40:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43350) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUo2-0006hN-10 for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:06 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:36763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUo0-0002nV-4A for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:05 -0400 Received: by mail-wr1-x436.google.com with SMTP id h8so19454639wrf.3 for ; Wed, 14 Sep 2022 09:00:03 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id az8-20020a05600c600800b003b27f644488sm17858772wmb.29.2022.09.14.08.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:00:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 05EE01FFCB; Wed, 14 Sep 2022 16:59:52 +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=YtututB/HwLz66Zj57eTsQrfGdUZAAhyrcZh+dfp8lg=; b=e8qhptXImSiQk2ZYA5+GRlLCbCis/0FE6wzCTwKUP3zbP6KAx0a5/pyXajefFkz9Id iGc4zDZRYcqQhcKEXm9bfH41iGMSZdQEAuRwNUTfXbgdF7+kBSoc//8wB/wihYq314HA uG5DNmMoQXbwd4L1NGnrSvIrhyWScPQfUTOMTm7lFMDkbhxXeSdFBcMyhKKxmA1XFGHq t/bjET61OamWRdk6yemgle4FNB8suQdC5ks8JZLBizavgnf/p/OkSqj1rAK5QpjlUxcx 8vygf3Y5sW0ywCu3MdganqTqsB0NfYcDokbna+8gYFNb5H3tPlXX2Dl9pix/dmMCH5Vs GjxA== 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=YtututB/HwLz66Zj57eTsQrfGdUZAAhyrcZh+dfp8lg=; b=qoXAwBs0dhbUw48oO2qrASEAUWdR5WFt57ojZNETDWZ+QmaSdXYl22iENCSFuKOxy0 4M84VK/0DvxiFoC4rPksSQIpyKurU6S4I+xa4iHogwPfbVJnayX7irLNPJAW+xsa79b4 COVzACixQy7KUSe/5D3cPQ0mV478qnFE+4Erbz7VKb5Keh5dwLeDdHZogNjllXYXtfb2 ZmSVO3PvpjnF2m8/dKGaMJTfSQM0TXhIgIHf7/J8WgU1mcDnOStiqfh0U+4OZsdh2Dou hFxlUSxQ/rpR9TCTiNqj/WsrI0HVzp9ttECJJsBrSKicfvYhyCNSY0RkuCoj1cqCbJNS /NRQ== X-Gm-Message-State: ACgBeo3JC3OTyNGSyxcuIQlOQYID2vfDQm1G3AgXp6aj8NsmPC9uLgZe fP0vR5yQ6PPJXMdWCsduAbJReg== X-Google-Smtp-Source: AA6agR7V7tmg5hGb7PteHkdy3a1alL+pTDI4+nuW0rpi2Aimv7JbZGcM3Bo51QtaNsP7M/SqIeSpKQ== X-Received: by 2002:adf:fd47:0:b0:228:dbab:8f5d with SMTP id h7-20020adffd47000000b00228dbab8f5dmr21311729wrs.524.1663171203325; Wed, 14 Sep 2022 09:00:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 19/30] gitlab-ci/custom-runners: Disable -static-pie for ubuntu-20.04-aarch64 Date: Wed, 14 Sep 2022 16:59:39 +0100 Message-Id: <20220914155950.804707-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::436; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x436.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663173623984100001 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> Message-Id: <20220826172128.353798-14-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- v2 - rm --extra-cflags workaround (now in configure) --- .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 Mon Feb 9 16:21:41 2026 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=1663174146; cv=none; d=zohomail.com; s=zohoarc; b=nYJqXNkDOWI6GBfTqvUyJzO8os3jKLrquOuNsFo8v2CYp0arnsHJDsUcwMGYrXK+hnnNWlatmW1F+h5BuCOI6dwYnv32J0olxxyGgKKOhU5kzBz4f9CoFh8MoRNXMk4tV8pas48bamyJzNKnMpsVtXfzJLEE2N3JkRDIDqPKk70= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663174146; 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=jW/HxwR3uoodS8LJxL2VV8mYc4s1IlkDnlKZ+eLVdLY=; b=ZjYvrBz1cGWUMdeZEJzleiBjsf9bZ3C1eoNV9iUZC453pSjOFRR8+aaFgYDYqtH1E+qKceMwF9gtMXwz18CgD2dgrqhml0KLPbeUv7kc1julw4UO9wwMOYirVyCQh0mOUClpAWAmyjjMqaVfVdy1RTOh+gs3Wmte57umeWX5yoE= 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 1663174146183551.8530602388092; Wed, 14 Sep 2022 09:49:06 -0700 (PDT) Received: from localhost ([::1]:47260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVZR-000272-1F for importer@patchew.org; Wed, 14 Sep 2022 12:49:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57154) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu4-0001Ua-AY for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:20 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:47074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUu2-0003rv-6Y for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:20 -0400 Received: by mail-wr1-x435.google.com with SMTP id g3so5563338wrq.13 for ; Wed, 14 Sep 2022 09:06:17 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m7-20020a056000008700b00228ccd00cedsm14094772wrx.107.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 231401FFCC; Wed, 14 Sep 2022 16:59:52 +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=jW/HxwR3uoodS8LJxL2VV8mYc4s1IlkDnlKZ+eLVdLY=; b=G6wDpVNArZds0CLzvNDzjjGlxe85gsUfdtnzwQnkz9exrR+o3KtH7ZlWP/cFOoU/gX csuNXSWZtP1Rm7sUfdoZ7jI4lMH/iZfOq+CsehW58XWyKj2fsf6cVbmnrFRlnBryvvhS UZTT0ugDhlJaL7vDlAq+WCbTzdKPFSQxDK79jW17vO7RQoH5VvtBKj18DdSjd7ZaZCio XDUSB6C9ibTgbMtdPkhI1dIBthDQ2wuoRk1MxwBvTV0+5vzNGZrty3ZEyJ8KQSNP7Usq prbIuyEYvoMnJitYSW9O8Fe3LpAEfjjzVPnr96cbyPRZHx27YAAARD2p3IPjXx/q+nYP 8Z7A== 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=jW/HxwR3uoodS8LJxL2VV8mYc4s1IlkDnlKZ+eLVdLY=; b=wB1kOLIg8xbY4nMeg3fqLuCVo2q2yVObxyVdhWF+YRC2HeOmN3EmOnna+l04z/GwhA J0MW7ZinDmB6z+yHEYnbFxFU/SrLzNOclS/QXEBExe4GOIKJGgQJqGvFfz4UmDhgKXcy MOd5f9ZzhIwEFlXeNIGSBbPzi1esCCVWsuzZ2sNxlQ9JoYJNmVaeZmpQWoBdGQfd8lnU YrBmYInicO3GbAmNjmKDAHi/ciJnBqCow6GT4/OnyRcKiBJ4iAs/rYlHtASAYw93xN+r HtoEBF9X9t5EQnw5+wNF81ggyJ0bfZeO/3ZEW7E4kqImdbn4GPSNhbajRehCBTfVoT3q A2sQ== X-Gm-Message-State: ACgBeo0+w3MgtlS+aA2QZZz6ye3N8wCUfHga8hhr23elL1sFlciCWbEg ZbMVh7Xtb+tyLcf6qQw8LVSz8Q== X-Google-Smtp-Source: AA6agR6RUC6MVWNFx0xzh/wFlZTa1OIqUg+PCFJ/piBj4MZNjOwWsneLty9xmIvuKR7B1LjaNz479w== X-Received: by 2002:a5d:6c6e:0:b0:22a:c36d:e411 with SMTP id r14-20020a5d6c6e000000b0022ac36de411mr4288574wrz.183.1663171575830; Wed, 14 Sep 2022 09:06:15 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 20/30] gitlab-ci: update aarch32/aarch64 custom runner jobs Date: Wed, 14 Sep 2022 16:59:40 +0100 Message-Id: <20220914155950.804707-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663174148064100001 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: <20220826172128.353798-15-alex.bennee@linaro.org> --- v2 - fix extra-cflags merge conflict - update MAINTAINERS --- .gitlab-ci.d/custom-runners.yml | 4 +-- ...4-aarch32.yml =3D> ubuntu-22.04-aarch32.yml} | 6 ++-- ...4-aarch64.yml =3D> ubuntu-22.04-aarch64.yml} | 36 +++++++++---------- MAINTAINERS | 3 +- 4 files changed, 24 insertions(+), 25 deletions(-) rename .gitlab-ci.d/custom-runners/{ubuntu-20.04-aarch32.yml =3D> ubuntu-2= 2.04-aarch32.yml} (86%) rename .gitlab-ci.d/custom-runners/{ubuntu-20.04-aarch64.yml =3D> ubuntu-2= 2.04-aarch64.yml} (82%) 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 Mon Feb 9 16:21:41 2026 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=1663173460; cv=none; d=zohomail.com; s=zohoarc; b=a+G2lE+KtBfFCufd2rbgf/2AffU4OMPqBqh5NFOGvizIF1fHjdqed7fnXLJwQFe3S1rntv1RQ3TFdT1ADmyMZMSx0SpIXY2IVG836ldmY2pBujP2zAFiNdyDeEzmNibmjex+Ws8uJBQWWkM61ZH+rbSHVv2qNOXpqhSNfbre3Ek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663173460; 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=yAaFojbQkLuJrmRuutKbjfhF8VqtzVDMFoLs4p+0R1k=; b=nWcSVNzxefA/Ddxtn3eLmQLO5kzywSU5U8bfM0xPaMTvDIrtSIs6wuMelZ7ll1qdSqwpPAweR/VWAPbqNGqW/A/f3k4bCsvjMMWhuUw66BLhbPhrWyAcdsx7JMPYdvuLj4Xo2C3WSPdXalciN2vWKQ5WGSWK78uCuDzCIimlVVk= 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 1663173460825504.01207390100126; Wed, 14 Sep 2022 09:37:40 -0700 (PDT) Received: from localhost ([::1]:58016 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVON-0004EF-49 for importer@patchew.org; Wed, 14 Sep 2022 12:37:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu1-0001RP-Er for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:17 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:41949) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUty-0003qs-8x for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:16 -0400 Received: by mail-ej1-x636.google.com with SMTP id gh9so35860317ejc.8 for ; Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j10-20020a17090623ea00b007789e7b47besm7752771ejg.25.2022.09.14.09.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 469301FFCD; Wed, 14 Sep 2022 16:59:52 +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=yAaFojbQkLuJrmRuutKbjfhF8VqtzVDMFoLs4p+0R1k=; b=pp1Wbqo/wVC0N96asZpYIdvNR+XUZvzvh35mgXDdj9vZq6dUK/0nDtvacy5ooB5xdT JoO4vaiBuiRF3WgaUv1t+UCUHIBEStnjrb7+Jqm3SS7+QmnEX6AVwGC9mYoIlMMlOiw5 9JPIFGvjzmuaTPgfmrx1YhBeu42Bi5cDRv7Sb4JJABhcyHFT/O1+wmLmNIcT4zcBYkFf cPIHf9/BHASxPAqppknMWt7N9L/BjxUbJu9TkZkVFXCmwg/ZFXiyxzkGHV0cWd1S5w8X x5Vz1eP1B/0/peksvfNYEIDf+K0VwL2+496+/+Jne647JR18F7x7K9qPL88IMVP434Uq mRVw== 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=yAaFojbQkLuJrmRuutKbjfhF8VqtzVDMFoLs4p+0R1k=; b=lm48Fn9mh9TIgh9na5hfLuZ1ua+csy52mvKajEeHcU3bFCEAOuN1sp73DAgz3tuOjc l14Q/GUYZ/kM8+aEO09KbY03H/LynSmW/WYo+SjjQb0pr6jb+7mNwPfJ1Fk/4Wp3V6E6 oI3ActFQxxLJbI4mdkRdixKHI/RJ8jZs6mlA0QCRoOA0x9helPMWDIZTQulCVSsX646R snYtf8IRyNYyugr1wvyIXNqWGDcaf5AOKcNx5YB9vbIlUNCiJ5w6H/LWMpZpbYlpQTkE BXXF2z8xv3xx+kawi0s4y91J8Ugx+9PvZH+qRpzIgUYG0BkWqPedaoOsDeTa7oDDocUp hYxg== X-Gm-Message-State: ACgBeo1UbDstrIPnFSQDHMiE2HJdiqhvlScvDQcd4x3NB6qV4OO5yXEH u5jF3I29vnp1Xkp+UQfLX1oAuA== X-Google-Smtp-Source: AA6agR7skEdWnwOHfyOkT3SEIG4StYt441HBYaPjY0Yp2ncXZh8vm0UOw6nuSCvTnL2sYE+uqaLVFw== X-Received: by 2002:a17:907:983:b0:77b:6e40:8435 with SMTP id bf3-20020a170907098300b0077b6e408435mr13766391ejc.570.1663171571835; Wed, 14 Sep 2022 09:06:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Huacai Chen , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal , libvir-list@redhat.com (reviewer:Incompatible changes), Jiaxun Yang Subject: [PATCH v2 21/30] Deprecate 32 bit big-endian MIPS Date: Wed, 14 Sep 2022 16:59:41 +0100 Message-Id: <20220914155950.804707-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::636; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x636.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663173462523100001 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 Message-Id: <20220826172128.353798-16-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- v2 - explicit little endian instead of LE - s/A/As/ - restore mips to dockerfile --- docs/about/build-platforms.rst | 2 +- docs/about/deprecated.rst | 13 +++++++ .gitlab-ci.d/container-cross.yml | 1 - .gitlab-ci.d/crossbuilds.yml | 14 ------- tests/docker/Makefile.include | 5 +-- .../dockerfiles/debian-mips-cross.docker | 38 +++++-------------- 6 files changed, 26 insertions(+), 47 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663174733; cv=none; d=zohomail.com; s=zohoarc; b=IAVHubPGVYLqxYysYyx+CdCv/Knx4H2NqtWIci6uXggh6aP8eg8pvXrWBt9l6erJpNZsxC9j/F18puNATmmRqlLZdHRzPvb1XaI1E7tY5BuBlvTVkGRu17wvy13t5EIHBenKIm1WpNbjLOR6XzDB4Rs0J7hoftAAb5mUgdmxc9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663174733; 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=CjorgUKQ0wAJREnGajqwiUqGdPFKd/Yke5pdcIHCgJA=; b=efgRvzW4e99m5L7U8YJdVDqUkILkDpLHONgKEsL6YtPnakCtQ3CbbmWLdBML2QZq7cSIx1vYMT1Q3RiM61P8DfAK76DpoU2RjHX2hjQ2Q5425qmWYU1SUGcLwq3WE0ytgzsR8s1O+E4MFAFh1Dqdh1ssXh7pDQf4+w/gDvqgPcU= 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 1663174733835686.033079839857; Wed, 14 Sep 2022 09:58:53 -0700 (PDT) Received: from localhost ([::1]:48984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYViu-0007Aw-Lo for importer@patchew.org; Wed, 14 Sep 2022 12:58:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUty-0001Nw-Io for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:14 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:44851) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUtw-0003qb-0k for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:14 -0400 Received: by mail-wm1-x32f.google.com with SMTP id n17-20020a05600c501100b003a84bf9b68bso11860932wmr.3 for ; Wed, 14 Sep 2022 09:06:11 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id h7-20020a5d5487000000b00228dbf15072sm13747576wrv.62.2022.09.14.09.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 570921FFCE; Wed, 14 Sep 2022 16:59:52 +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=CjorgUKQ0wAJREnGajqwiUqGdPFKd/Yke5pdcIHCgJA=; b=T/qhnq9IAQIU9zzdHrWpYmbqIC5N20lYJzyvFd6Omd6DzFZCtP8rb3UeA8FO9gx7hZ CU85z4dEP2aDObqJ156fGRSKQ7ViYQLib170MUNVPuCmFu5biT104oc7/96Xv9FGByo+ 92Q5oQjUxZR8bvrc2NoAztsST2lLPStrHuGGShFuYGCKVUOvbTeBeMXk2nYJLrMq0THn ACOg4q4VwQkwuTJZ43dOH38pbwLhPmkNIEtv+09s7OnUO40yid7/LZxUGgoYsJeFrAYA ysMvAA/veRrx1cWpAQfl9/yj/P2TY4tXJJiCjHO3eIEzAP9Eb608YEHnUIE/TpuVv+bc Sa5g== 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=CjorgUKQ0wAJREnGajqwiUqGdPFKd/Yke5pdcIHCgJA=; b=eJjbjw4VjwbDtEsM9bPU5dRVmJHVuTFA9j6h1h5KMlQbsxXDr/Bx7KixCTak9LmgTP zZuvXIQg8CYgj4FysTgK23RrgJ31hNQyYdsLiAGdR4oipJ+WpknMlWP1ZF8SMw8vw6hT /mixPtRyvW4NBxBJalReBVoiNsk5fD7ERueOmiE6WOzr0uxwY8h3LP0Wf5Gm3JZTi8NN De//Xu2uDgjOPxQ6clDN3XmOO2aqO+JJ59fqUqZMKIRfq93DM0Pm+CxHk+HYIJKphI6y jgjl/Uez9262cpNwdvHiNTRNvrMQMBR/WvlOaIICkbMH6ENPdcllr6Z+4AZzGSd7OBac D4WQ== X-Gm-Message-State: ACgBeo3wCQkTNb15xr11lw2eFADBl4Xah2hiucNO+Vzapujp3CI4aORi Mlnuq3DOvpfSILNDeEjygisT3g== X-Google-Smtp-Source: AA6agR7wQwQxzdHQrOmPO5GkL39iRQfr4kF3ShMqHBcC2yIvy50kHciUCLOFj0ZPAuXPZEWa+QucOg== X-Received: by 2002:a05:600c:35c6:b0:3b4:9a9e:464a with SMTP id r6-20020a05600c35c600b003b49a9e464amr3705425wmq.206.1663171570438; Wed, 14 Sep 2022 09:06:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 22/30] tests/docker: flatten debian-riscv64-test-cross Date: Wed, 14 Sep 2022 16:59:42 +0100 Message-Id: <20220914155950.804707-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663174735739100001 Flatten into a single dockerfile and update to match the rest of the test cross compile dockerfiles. Signed-off-by: Alex Benn=C3=A9e Message-Id: <20220826172128.353798-17-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- v2 - minor reword of commit msg --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - .../dockerfiles/debian-riscv64-test-cross.docker | 10 ++++++---- 3 files changed, 6 insertions(+), 6 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663175375; cv=none; d=zohomail.com; s=zohoarc; b=Zs5YDQQF2335Unm1w9uCm8/E84rLd/2G7EEOnZ0jgKJE082jgBgVoX8d7XuDpMkYp7uozvDc3COki+fJh2XfCVRS3cqVnr38MUPsX/BWD/aYu5ZbUHy8gxuGAhmfLPPwbGDgTI+s51T6cQmzDQk4OiYI7M0oBjk2YVn00VVrGe0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663175375; 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=YliCTsRpMw4ev/s9tqMpyIV52FVHUEOsSSKUVnWbVIc=; b=gw1gM7JixS2oIbUwW9v4KvNj33h9XMFbmc8cr8XLSHYpyJ3t/9SM6FQmsMty1Uyv0w6moIRbEZ1rZnwLyC7AxVEu/omH9GgGa1zOo4rFuJ9JD7pup0AjwIKRmIySeWGunhGpkxAkAFVukj9UBMhcflmGCUiqy7lUUT61PM1DGEg= 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 1663175375841799.1714877657795; Wed, 14 Sep 2022 10:09:35 -0700 (PDT) Received: from localhost ([::1]:48188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVtF-0002sw-4b for importer@patchew.org; Wed, 14 Sep 2022 13:09:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUuF-0001e8-Fq for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:31 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:55125) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUu0-0003rb-8u for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:31 -0400 Received: by mail-wm1-x32f.google.com with SMTP id az6so11958912wmb.4 for ; Wed, 14 Sep 2022 09:06:15 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id v8-20020a05600c12c800b003a844885f88sm16592326wmd.22.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7404F1FFB7; Wed, 14 Sep 2022 16:59:52 +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=YliCTsRpMw4ev/s9tqMpyIV52FVHUEOsSSKUVnWbVIc=; b=sjwCTR7PmJx8+DRWxVBvgcAqG4qLkTz2TrfWfaHptV5znz7L7aolf0EJBIum9OHra/ k3Y3dFJebVC8nIZkms2QQLIY8LOM7TnIWHeMNfI1IoMGaGH/4pDF2P2ApEbMdnlTePwR fsJ4z5kNv//b/G5k/kdJjggvycOY4vuQsb4y9GELOeUGqCLsNDhU8gYQdvVjKKiUuQF8 vGTW9zs9GHz9e2NmU5uhG/tlyVixWXXzZUwGs6VFtBX61P/LzNyZJsq0i+hRnQbsZQgi VXM1YaIShI+AMtsT3Gm/h2rvM4C/IJB3xvClT41gEoEIkm3f5I9COz+6RzgiSg6ZulUu TADA== 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=YliCTsRpMw4ev/s9tqMpyIV52FVHUEOsSSKUVnWbVIc=; b=LO4MvJvb3uIw3ie9FbaAGqAQlFJWQrprYP8XhGIC0CsrbxAGH0VWhJe9j5W2wsKv2q EkpLGuROBitpO7uSZWZ+thiLgo079wMNF1pSei3TxnlK8j+YjfUPo1kL7NHElrR7bNrT jJ2DTfdFCItOkDJ46FbhrPUd3sBBDh3kWF2ClmYCYG21kcY54FhoYVOxn3mHt4vtyAIz 0VTSDiOO8VsfT3QqUad+XKgvHnYyi8oXoilCmvML4NnP5cZ2XAxjP17ZkXG+VM7K4qDb v1uyaYS2ERKYcziHf9JV60XwfJApLcm5WIh45JVKm4KNhjWzFlxfyQGT93cuYg1+y9xV galA== X-Gm-Message-State: ACgBeo1W0t64bYzAtKqX/PhnETG9ySUnsPs5lQTuk3R9g+t/AVzU6cfk 2uzX4NOsc17Y9JDvUVEWnoNcsw== X-Google-Smtp-Source: AA6agR7FuzmUdMqp3x/zzA9Kk+uki6GzZbhuk7+Qt35NmwWeG3wB7NwBoxSSuhlnqvs/FMJAl2v0/w== X-Received: by 2002:a05:600c:294:b0:3b4:794d:fb6a with SMTP id 20-20020a05600c029400b003b4794dfb6amr3708906wmk.128.1663171574756; Wed, 14 Sep 2022 09:06:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 23/30] tests/docker: update and flatten debian-all-test-cross Date: Wed, 14 Sep 2022 16:59:43 +0100 Message-Id: <20220914155950.804707-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::32f; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32f.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663175378327100001 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 Message-Id: <20220826172128.353798-18-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- v2 - move ccache/clang/git/ninja-build to main insall stanza - minor comment tweaks --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - .../dockerfiles/debian-all-test-cross.docker | 18 +++++++++++++----- 3 files changed, 13 insertions(+), 7 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663174090; cv=none; d=zohomail.com; s=zohoarc; b=gxhmfSFLeN/MTuBaX+ToMjeKSWHzO6d9BK+XMj7H4Of7GL/U/EMhBxmAYnV5H9v1wpj/gnUP07GPU0t2DreXB7mETC89+gFSSFWhkPW4CSdvqP/xajJ1nQl49FBJRrdSg4VO8n0M5vWmzTbbQ1FdEKOhDBmPAucfshKPvB+VJac= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663174090; 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=DOBOInzSt+enCwl0nSHMUZYxdD3wfdAmUMtGktSPyVQ=; b=TqHvMRmAomAYIPnWMSQ9kM/yqGE5aTeNNjzxqjBYDGVVqeDcTyrsGvs5Z4wsyINWYeyforrmH3SJbgUAqwo+yI59qGPdRVpK+RsSr8W9f9sPersNe/G6+tqc2ZQztsqxgSYMQZo98jK2Bxwu14VTy8ViwDHnIDI91t8IcSLKpbM= 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 1663174090952734.2122120995379; Wed, 14 Sep 2022 09:48:10 -0700 (PDT) Received: from localhost ([::1]:39432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVYX-0008UA-PO for importer@patchew.org; Wed, 14 Sep 2022 12:48:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57156) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu5-0001Yd-Rc for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:27 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]:46039) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUu3-0003s2-QQ for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:21 -0400 Received: by mail-wr1-x432.google.com with SMTP id bj14so26424583wrb.12 for ; Wed, 14 Sep 2022 09:06:18 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id n2-20020a5d4c42000000b002250c35826dsm13773676wrt.104.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 88D7D1FFCF; Wed, 14 Sep 2022 16:59:52 +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=DOBOInzSt+enCwl0nSHMUZYxdD3wfdAmUMtGktSPyVQ=; b=Ms2OlgqPhxLSrLKJ8GVJXi/RLjtyAeWzBexO2WcAH1/lWo8ImF/QU4ixFSl+HrUWhY toN/r6UYqocIOdh892clNUoxTc3hcldS6q4WF2ra97/elbxKxyi1HniFMy+K/lS2CBhj k18on2PN6mzEg3/KdClDLmoYXpBUX+raFgAbbPhfQvygrF1Y0VsEap83BR9lX9hihh0A rCJA7fqq96frFvuMJ0Wcx2jBNjFS+ivzqdNA1ryBAvPSNEOCsFpTqWahEkCF2FKPYlSx NPdB2voKhfeFlZRt1F5Q6K1zv7W9Y+S9kRcU7LFS/f/QT49SiCgH0i/jxT+sTrPcKljL A5Cw== 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=DOBOInzSt+enCwl0nSHMUZYxdD3wfdAmUMtGktSPyVQ=; b=azrWyIH0Bv37urMli9+ikzWNZaAXS5/7vBGrOppEamUNMdHGZFIdZ2x86nz3ynwf6j 83YHqrR3PqcJG2f/Hos7msj+gYfVUizDnpkGFzzCAIBjk9JKgkta5Yh0IatCexaxZdS/ ZaXE60W2YykZNbll+/bJPDFg5MYpkWa3HOcFwd449zKIDB9X4WDe9If//OPIsUCT3uaa 3mtvxAx5o53D/1kevTqZQNVbKPb+1VOX+Za8+gKxuy8Ydai4mAzYg+RbNsiCuy82sM5y vJnMtmz8nKGEmpW+4clsjMvOOYEZIQ7uq1p1lw0sRrTHXTH/pBkVoVCui7lZ2SGLADpD Zv2Q== X-Gm-Message-State: ACgBeo2xSl6gYBAO8RyzwTXf4PGsqcCzGQ70DXksl2LFBB+6DIcyqzEj AoD/yXOMh0X2Swy3KXpj8UFt0g== X-Google-Smtp-Source: AA6agR5aR4zohxKXfpETDJIGxLVLJxKsJYNgVHmSuGCJa5peO985XL1DITFzVMPnMlVx2u9q/+LMWQ== X-Received: by 2002:a5d:46c9:0:b0:22a:4306:b77d with SMTP id g9-20020a5d46c9000000b0022a4306b77dmr14744515wrs.305.1663171576159; Wed, 14 Sep 2022 09:06:16 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Ed Maste , Li-Wen Hsu , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 24/30] tests/lcitool: bump to latest version Date: Wed, 14 Sep 2022 16:59:44 +0100 Message-Id: <20220914155950.804707-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::432; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x432.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663174092920100001 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: <20220826172128.353798-19-alex.bennee@linaro.org> --- v2 - expand commit re:libslirp --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- tests/docker/dockerfiles/opensuse-leap.docker | 3 ++- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- tests/lcitool/libvirt-ci | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663173854; cv=none; d=zohomail.com; s=zohoarc; b=N+4RLEL7T4yLIf04pECIZbeXMz+imIxcIk2PWXxZFWeV0fkt0Ge8eAANAnC6kOPKWE7gDpZnMkXp07zFrwSe6u0Fbonm4Gn7QMfp0ryuhWEM7pgaa6jX0J9Dn3AD5YxPyurnuv/m56H/WpagSom+ycAifZo7WhxLZ70sz5ekSs8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663173854; 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=ECDuZFyCXgxzb5T4QRP2tWAs5cywxGurwT3H7qt6mNg=; b=egXh6H1NJptKmvjgkBbIsEcDHMYFLnO/AlTRlefLd1dWXeUTIQEqnY+RIHUGFfJbrIhVXLtbxv52pvtXCyrBsExTmg582gHZhUVcFwitq+8YsCB1Rd/0aVlrimTz14Y0sVWWmzU5yZ6Y4jqkYAspchUJjnUiKtHR50ymsB6mfG8= 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 1663173854492581.5627346606344; Wed, 14 Sep 2022 09:44:14 -0700 (PDT) Received: from localhost ([::1]:39056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVUj-0004N9-47 for importer@patchew.org; Wed, 14 Sep 2022 12:44:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54146) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUtz-0001P7-Cb for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:15 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:36840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUtw-0003qp-T5 for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:14 -0400 Received: by mail-wr1-x435.google.com with SMTP id h8so19484699wrf.3 for ; Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id l16-20020a5d5610000000b0021e43b4edf0sm14042547wrv.20.2022.09.14.09.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A71B31FFD0; Wed, 14 Sep 2022 16:59:52 +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=ECDuZFyCXgxzb5T4QRP2tWAs5cywxGurwT3H7qt6mNg=; b=t7EN3ZD5yw+KZLb4H1uITUFxgQR5rZtpuWUc/NB+8yuPS1R5Y8jgO+/yq5fAEHz4MD RISQ/2uEwflJZGe2kppJbhUPZvIBLygxXOqCZ8n+wQGd6xHMjK+w3KXjUSIz6EGKnFey CWD0USPOB2pQGnxMVcQeUTN3RD/A+8XkFKGEkj7coh74SQwAhYN9E2EDkaov2XXb/am8 916S1bHepP+yhdrEUDiBgCXi0hlY4wrJ1nqcmofYMaxlfTuve40nczoWoN+zFYXyOviP 3KlCk3y/V+jznpZ803GTIIFXx+IV33/i6u3ANhHlm7evaOthFZLgwuAOATInX1hwN6H1 AW8w== 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=ECDuZFyCXgxzb5T4QRP2tWAs5cywxGurwT3H7qt6mNg=; b=zAMm50RyDhT23iigTTSyb/f6wS314Gr4el2L5oieT/xyXyQZhTJcX7GUMx3Us4MoLw 8mvrjti7zpH147TUyAlyaPestO2RiYYtazoVXgQNEyyj8whoAfgcV1HYlBP3/95t64KR oTUAJaQPNGgg0adSZHlZ9i/GPeVfFWUqA24fxjz1LpYgAxvwlsoPA9s8Xx3w/7YC3DP5 2+BaEQUqb/v16m+xTAJ+owKZuPafdlhCSmD0AbNTgNCJ8xrlh83nxeo8kcJ+rcyOR9LC a/p7xTKMrOvrbDuPMqtErrB7+cb11xSNDfcI8OpR2nMnwhILyf4LfW7kTXsX6Y74oFDp RnWw== X-Gm-Message-State: ACgBeo3SZOkhZy66oSX88CW//FRLT+qjXKvsWZ7oI8XZ0dKANxme0Tw+ TQdFEfkHwdIexlbq/6cIta8FwQ== X-Google-Smtp-Source: AA6agR6NJBZeYL+U06qI0IBe1LTyeYd8hvRJndWawCH8qMjaJSFI40fvymoyz3Lv99hF6cyN0bzDqw== X-Received: by 2002:a05:6000:178a:b0:22a:2c1d:f563 with SMTP id e10-20020a056000178a00b0022a2c1df563mr19074572wrg.384.1663171571500; Wed, 14 Sep 2022 09:06:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 25/30] tests/docker: update and flatten debian-amd64-cross Date: Wed, 14 Sep 2022 16:59:45 +0100 Message-Id: <20220914155950.804707-26-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663173855082100001 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: <20220826172128.353798-20-alex.bennee@linaro.org> --- .gitlab-ci.d/container-cross.yml | 1 - tests/docker/Makefile.include | 1 - .../dockerfiles/debian-amd64-cross.docker | 178 ++++++++++++++++-- tests/lcitool/refresh | 7 + 4 files changed, 169 insertions(+), 18 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663174005; cv=none; d=zohomail.com; s=zohoarc; b=i/BW/P9UBHmKFD6tmpMFPTUIL7AWMsi1npohaPemFbASrLbu76rxIsQuhjA+OAe4+Jy8lx7qyL7bXSVMq5b4pb89LSp0rYmjeLWqovloWaNgAivSE9DrOx/8glLzZA/WXXexD+tS3M1jWZA/KJTGhs0S3uvJ5ZGc0oiXpgqZr+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663174005; 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=3C+bQmjL1wvLGpweQJ8MbVcrOXpM16i/PFvvqaa7Mdk=; b=ChxKuTqtR5UlU/iaPgfAFQcxUQgxJc5XlNmhKZhQNJBR18SAjV9IBb2Ci84nDOjgZ4tCJusJ+/6g8vLCIhmBL8eLE7WlK/sPOo4x4sXDT+P1A2TszLyyYZ+ike8/whNNh/7HGlTlIOn5n2UttL5uEsqxg8ROIHMRiW9Ft1tYgwQ= 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 1663174005361460.9341406640027; Wed, 14 Sep 2022 09:46:45 -0700 (PDT) Received: from localhost ([::1]:40328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVX9-0006yK-Vk for importer@patchew.org; Wed, 14 Sep 2022 12:46:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57150) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu1-0001Sc-Ow for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:19 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39613) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUty-0003r1-Ft for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:16 -0400 Received: by mail-wr1-x430.google.com with SMTP id cc5so16625989wrb.6 for ; Wed, 14 Sep 2022 09:06:14 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m3-20020adfe0c3000000b00228d6bc8450sm16585300wri.108.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B65471FFBA; Wed, 14 Sep 2022 16:59:52 +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=3C+bQmjL1wvLGpweQJ8MbVcrOXpM16i/PFvvqaa7Mdk=; b=GZnXILYSVnHBWlvYtIjiTfDOVlv6LEoA6ErLaL9QDKH23GcxisWCLbYq7xYGLlR+4r zfglzjcir78pjU/oN8hE3SL+EdYZ5vJSAAyIefSMKCO6Ol2tgYjrYt/ZNLBIBVgiANXN xSAEOuxBZSkHTuS+YN+T46v3MVK4A9h8pkST1qtAYCz6vQCVjUiQUcK4rtnbkQ9UaJBA VWScw+w9XMUMI9jGu/GkZexHHA+RgsDfksKZY+OhTnvL9wng7NrIxYlUv2Fl42BEKZ58 AhG5vWVbldYA3QJPe2U1jqJ36ttBK0dQPjuJqZY6e8tYi3ziSgu1Q6aHJSjVL1frtumX /iNw== 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=3C+bQmjL1wvLGpweQJ8MbVcrOXpM16i/PFvvqaa7Mdk=; b=RkGvq5Cw3bWqGJbSc/Fg+E0LvKnPDPEKe7RebdGYEKYh7boQtab3cZRbANH+74pMA2 OCPClkivcky0NTf/5OOy75u3mLTwEWw4qujNDAXXq8oNMMdGzMuOmRZTemDpuoKQJivB lJE98RzCrAZh5a6OFtK/+wEW0aPpYp+3d0ZJ3D2j+ANS+bP2s1q9CpW1DBEhhdyU0sUH z7Y3TAgCtlRQ8HDha9vZdR/RX+f7DCVGAIFRtoNhmpXJ2L6LmW8PT+KQ3ktqrG+RAdAb KqbMalaBu1eMgfTAjDiO6sIHgS9SueV5NxWPfd6FnQv7uepaXaKxmNrAs28HNJVe/UuN kFKg== X-Gm-Message-State: ACgBeo04vBhjLJge5jW09CgNeacovBVmQEnvkrK+CNDdwOUBQspS83AH KaqrrFvxI79Zi2FhczOxmv+WwoL1OHMBl27x X-Google-Smtp-Source: AA6agR4QYRvAnwX0T9dEohL2bvYh7UUv0TOgUxe7XjF2s9Obe+TlCEKB81eAbpYNNHAkPG0m1TuIHQ== X-Received: by 2002:a5d:4534:0:b0:228:a411:1145 with SMTP id j20-20020a5d4534000000b00228a4111145mr20915268wra.222.1663171572657; Wed, 14 Sep 2022 09:06:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 26/30] tests/docker: update and flatten debian-loongarch-cross Date: Wed, 14 Sep 2022 16:59:46 +0100 Message-Id: <20220914155950.804707-27-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663174007542100001 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: <20220826172128.353798-21-alex.bennee@linaro.org> --- v2 - use debian:11-slim for consistency with the others --- tests/docker/Makefile.include | 1 - tests/docker/dockerfiles/debian-loongarch-cross.docker | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) 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..df578da40d 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -5,7 +5,10 @@ # using a 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 Mon Feb 9 16:21:41 2026 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=1663173904; cv=none; d=zohomail.com; s=zohoarc; b=ZfpOck+YrHbnUfCzNF4wszrkB1Pp+CeEm1T4P9HCfw44kcojjYb+DwxmXCzS9LE6PXbtevKHzu5uVfJ11uXGUswASjl88huokeBvxLuSPMXOC/k9CDe8nESdvoQAhg73jmaUHA5P8kOEpPTfsc/BmkCiZkYEIZplyF/134vZj4A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663173904; 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=sndVtu5XcqEXirLEG2n7a84U7O29s/uHZwqERDBcl2k=; b=O+CgF936m+SJoyvePPbeZjZOaNGA/bYZaG01pLqLsrhfux2Q+99PSgiA3paM0VBO5+Vx+RYgFz4PHitB76ivLfwgjGPnUaPO1hVrdn4JBbClf7JSvlj4y2vn3CDq/B/6/v4pnc3XcrJAej8FPoWtBz+3PH10Mm+6kqzPEpVqZBA= 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 1663173904002803.2272565150139; Wed, 14 Sep 2022 09:45:04 -0700 (PDT) Received: from localhost ([::1]:33916 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVVV-0005gZ-JB for importer@patchew.org; Wed, 14 Sep 2022 12:45:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43352) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUo3-0006kr-Gp for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:07 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:46716) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUo1-0002wA-3n for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:00:07 -0400 Received: by mail-wm1-x332.google.com with SMTP id n40-20020a05600c3ba800b003b49aefc35fso2595299wms.5 for ; Wed, 14 Sep 2022 09:00:04 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b15-20020adfe30f000000b0021e6c52c921sm16859002wrj.54.2022.09.14.08.59.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:00:01 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CFC341FFD1; Wed, 14 Sep 2022 16:59:52 +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=sndVtu5XcqEXirLEG2n7a84U7O29s/uHZwqERDBcl2k=; b=LfyssLbAkoW+mDkLhAMGJjUzR3gQuO5tBkk6a8qn2kw5lHWdaZZDN1TyJO9c6CTvMJ mq7yaFN8kufeEQPv14rJl4OCy0jUb5t10xwjUpS1Xw1wsCQsPVQ7eivfMWapnAwDHJsE o2arRKnVaEWjlyZNZshcuKHtJ8OTvJYlwiBRIcXyCOyJP/gNb6/JL/QhWA05lZVBvP50 ySVzLuxSc6PfsBhgJoBGGsD4bEZsyPYaeUvLK8iP+FbeBbxcZQr4/TftScwT65qu898H OPdkM0G2Es0qhIVr6hFK5TjjPD0HP8XYjthD5LiZflYA2Dh5yAJmlO9T98j7jzKzgMJC EB6A== 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=sndVtu5XcqEXirLEG2n7a84U7O29s/uHZwqERDBcl2k=; b=kqXIKXJZa+hQjO6IFLzmJ2DUfsVfPI2xdNSKiPyQCe+DF8T9YCUa9bS4a9DgYIWw8f Y7O8rW2yWTCWADS/jhN9k5JAmNiiw63axnBGXtejXTEBLvQef/DFowD4/aHBtA6D2Tmv nM590FBSy7aYQNM6YP+d+gM4M9rqtLE2O4Xfb7I/X68tKTRGsVFB9GFXmp7r/e7PX3ev SoSfCFodZw104qnfLk0Q3oXVvtipvzSkIDII+UUTkhko4zbK6+tfEvd1k+oy+uFt9NOm 6eCzpeOWm7OC+GsRxFb66FDaOeZAHr4YqlEesa6LE1fu2N5raBwAQngL/B0QVMv3gS3q cACg== X-Gm-Message-State: ACgBeo2f2+UPXezueKzIrJRt/IRkEc/jY4GVBGZT4BZuj9DLJWFZJglt e1SugQYaL5n3xpzXBa6JeeS1nQ== X-Google-Smtp-Source: AA6agR5llDjYLm2q62PuIc4arW9DmSJJqsYUHmaRuCcOnOFOu1m/e+i0rUPQAUr3VoP+/ghSV9p2/Q== X-Received: by 2002:a05:600c:2c4d:b0:3b4:867f:1e6f with SMTP id r13-20020a05600c2c4d00b003b4867f1e6fmr3753373wmg.75.1663171203799; Wed, 14 Sep 2022 09:00:03 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 27/30] tests/docker: update and flatten debian-hexagon-cross Date: Wed, 14 Sep 2022 16:59:47 +0100 Message-Id: <20220914155950.804707-28-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::332; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x332.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663173905386100001 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 Message-Id: <20220826172128.353798-22-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- v2 - use debian11 consistently - remove "stand-alone" comments which will soon be irrelevant - reword commit as we do need some extra packages --- .../dockerfiles/debian-hexagon-cross.docker | 19 ++++++++++++------- .../dockerfiles/debian-loongarch-cross.docker | 3 +-- 2 files changed, 13 insertions(+), 9 deletions(-) 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 diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests= /docker/dockerfiles/debian-loongarch-cross.docker index df578da40d..a8e8e98909 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -1,8 +1,7 @@ # # 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 docker.io/library/debian:11-slim --=20 2.34.1 From nobody Mon Feb 9 16:21:41 2026 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=1663173750; cv=none; d=zohomail.com; s=zohoarc; b=RHzm6GLhb46rX4xm9tmtEUtgVIYOrb4VACpa4RbL+HV6deHnWizw+LoNwo6gXXVHslsaWyAiEzto5rrz8TCo8VDvlT4yGZz6fx9zD/mncCDrq9ss5Nksizt+us+B5JUtEEDUFnBxKjVy2zUOc4ednx8m2jSMMP6TPXn816ZlGcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663173750; 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=BzWKln5PytAzOwwrEI5gVpszKbRJrpWZUaBdq/kcO8c=; b=MtVI4Tx7TIkiGidAKbX0VQPXW7trg/9QygSR90V1s+0QvnfXmAUfAxXDy5qaMPT4xnrVRnU81zkLD5viuI4WlasWGkgqdH0qtBvQRIukGEoud6XZArYqSdo/1HZXLA1yyrpCoZC653yOu9oZidInYz7KY81gjPQHjLnlxF2hVvo= 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 1663173750531158.35151995625677; Wed, 14 Sep 2022 09:42:30 -0700 (PDT) Received: from localhost ([::1]:54444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVT0-0002FS-6p for importer@patchew.org; Wed, 14 Sep 2022 12:42:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu4-0001UU-1h for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:20 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44859) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUtz-0003rW-Ue for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:18 -0400 Received: by mail-wr1-x42a.google.com with SMTP id c11so26445906wrp.11 for ; Wed, 14 Sep 2022 09:06:15 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id b15-20020adfe30f000000b0021e6c52c921sm16874931wrj.54.2022.09.14.09.06.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:12 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E86521FFD2; Wed, 14 Sep 2022 16:59:52 +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=BzWKln5PytAzOwwrEI5gVpszKbRJrpWZUaBdq/kcO8c=; b=MZctr4eVrNq7SUz7KTP2/QjslavlATnJvXPYekQS48H21gnAbjJJFnHGT9/+mo3GvT rLSVu+IxiGKj9liKwKcHAOq63pX+Hekfp/GoZb1DiNLn0qkqH1LmXd9f870ci0sgAKCL JrXo4e+bHul9SlCp+u9eozxgyc7cA7EBdnS4J8eFaJzfe3+0/s11dlzrV7O0rA+YTexf aSratoqdt5H0voZnoWlAIQPBZQDy+E1dmqm6pKAYy3s3kTeBUKSswL/ajuF0nVvDCfxl 8F5UfHlgzVseuWdKNVyWAfxAkWM+J9m4ziGmGPixHWXU99oahJyKB8fW91X28O7hl1AM FK6w== 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=BzWKln5PytAzOwwrEI5gVpszKbRJrpWZUaBdq/kcO8c=; b=QtaFHwhBQMAjq6/DJ+PYCRXyWz8N/LMFJMMIcCQqUKq2aX4T4wiq+SFQhiBlsjcrFc fDWpevYVInFxjvHnvg7OQcuk1018XHntySSIKgZAksvZ9rMTXJDuU8B7WdF+pi3x7HDm 84XyyGNywRo1c2KT3yOJe7Pm0WFx05Xud9khrRSHNunusJK8mjzbqpXoT6fV9guRXx2h 1aA+ZcSIsIHdAZFYDXIxxwy4z3isdZweblzzZZXZa0ToATdBRf1zbp9ulQirTn9SDR3E 4ws2kH6NrwIBw7ntdjrxEpowq1EmiOFSyYRVest1LNMQumYv1qwZBnEOIgSXCVwU+88I n13g== X-Gm-Message-State: ACgBeo1k85QvFYSSVe5/Vvy8h9itsP+zUlqMxM6S+3i7HQqBbw2EyZD3 zczItK9Haoswld3mYmAIFv0KNCgx8UqIcdVf X-Google-Smtp-Source: AA6agR4CkZYHjBU/8fbKNMf5He0g8t+D4YfNdl22PPy3y6O+Pa4yn3zTaGNCcSiVb5QhbEbpEb9Ppg== X-Received: by 2002:a5d:48c5:0:b0:225:2f99:430d with SMTP id p5-20020a5d48c5000000b002252f99430dmr23876985wrs.358.1663171574483; Wed, 14 Sep 2022 09:06:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 28/30] tests/docker: update and flatten debian-toolchain Date: Wed, 14 Sep 2022 16:59:48 +0100 Message-Id: <20220914155950.804707-29-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663173752515100001 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 Message-Id: <20220826172128.353798-23-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- tests/docker/Makefile.include | 4 ---- tests/docker/dockerfiles/debian-toolchain.docker | 5 +++-- 2 files changed, 3 insertions(+), 6 deletions(-) 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..c723377495 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:bullseye-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 Mon Feb 9 16:21:41 2026 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=1663173536; cv=none; d=zohomail.com; s=zohoarc; b=PkFDDhpWUbqXYMYpKZmgGGw3f7NSJmBELU15u9iwactIUWxVW15rburNy7TqkUVpWBknPqIlnqds3FtpLFJZV4ESaLuI6Q1L1bY177VbavDGfpaPHkdhwJZgqwTnq0cc5kuGXVOXSAt9DyrDesrI/FA3y5z31X4U1XUrnhBXeL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663173536; 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=iVi2M5JVgPxoYJPoTzeenSW9Sp6hbVA3bl4+rpNzI1c=; b=dOHAusmRAS0hEkKp8J2FnSlC1CUpxMAMk+V0o7+Slgy0NqsNB0yJu+u9mqGHSjUG8J1ispQZr74RdYorqqednYkn//6Uui70TZ8i+DjSp9rluoM1ooYFrAczna/jod1eSxsYo1llqGepJzz9bD0F4VEDXueKKyP3OoL8JeJu4Aw= 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 1663173536802249.5093561866894; Wed, 14 Sep 2022 09:38:56 -0700 (PDT) Received: from localhost ([::1]:50306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVPb-0006kI-Gl for importer@patchew.org; Wed, 14 Sep 2022 12:38:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54140) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUty-0001Nn-Gi for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:14 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:34451) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUtv-0003qY-Pi for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:14 -0400 Received: by mail-wr1-x435.google.com with SMTP id bo13so9952707wrb.1 for ; Wed, 14 Sep 2022 09:06:11 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id m23-20020a05600c3b1700b003b477532e66sm6817566wms.2.2022.09.14.09.06.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:09 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0B7211FFD3; Wed, 14 Sep 2022 16:59:53 +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=iVi2M5JVgPxoYJPoTzeenSW9Sp6hbVA3bl4+rpNzI1c=; b=mz4/OrEyjjt81DvzpbXnvsmvzRDJMYN+zISwQzHWgC+aGUFecFmQUxVml82gfV9Er1 EjeOJ07u24INePXJpNa7F0d3fZ8s2tLyyqZEAoyhWId/3aJJM/kt5WdYaOp5vB/PdGYO ovyD6sPOHMPJwNOAoVssO+ZtjlxmRJuApXPoZny8kBljvwCCEYOAs1bJ+SG6jKHsC1To iqcqc0rxE8e6kY4cUTK3Zimvesu2FKpR9bJekAS36Ev0Q1NCjJPOYWGi/a2RmoExndMZ YVEhPs0S168B1Rp4V/a9lOYsM01F5Y1TgOkGnLnJq9TWYFDEaMMG/VLFj7+ys95BKiXZ iyWQ== 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=iVi2M5JVgPxoYJPoTzeenSW9Sp6hbVA3bl4+rpNzI1c=; b=MovQRaKVlHfm3CrSW2IYSYlG5Pche800e1xfl9cNkxcgFmdj6i81i9ek6tBFs+fM4m 6OM8aqIyMtfYHjO58rNoJY2oTGLeUdfvWPeKHME+wy7BT8BYAff01i8rIZLuimEyspTj VrRClEqyYB7S6x+ktcEP0geBi8GBg3G0MKFuaSTWB/Fqfhy09OBKtb0oE8luK6vU7mdu L/j5PfEpmtgs6t3ovtUukVMlzHUK/91yahhw4s4fBvdSPyI9GhFrn+EeMmvcwsdda/Jo vKpoQfOb/Kmpfb/WGslesFfKEcWti8LNED1GnRnQfnhurqEOG+5K0B+c8CGgEYFvw39K LtsA== X-Gm-Message-State: ACgBeo0Z525QoKBAXbykkhQMzX1usezJJVG/6Qz57HxIFmka9Jna56Ip qmBPwvr7mstogzAtTKtUxhUiLA== X-Google-Smtp-Source: AA6agR5qUO5NVe9emfl8cqm9wyHQ+Y72OuQkeYOyRWHTNc+OneSnaQ5xkbevkSFjTgdTWVKwgcHcNA== X-Received: by 2002:a5d:4284:0:b0:22a:291e:fa8f with SMTP id k4-20020a5d4284000000b0022a291efa8fmr20378360wrq.553.1663171570204; Wed, 14 Sep 2022 09:06:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 29/30] tests/docker: remove FROM qemu/ support from docker.py Date: Wed, 14 Sep 2022 16:59:49 +0100 Message-Id: <20220914155950.804707-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::435; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x435.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663173538907100001 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 Message-Id: <20220826172128.353798-24-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- tests/docker/docker.py | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) 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 Mon Feb 9 16:21:41 2026 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=1663174399; cv=none; d=zohomail.com; s=zohoarc; b=Sm4dQ/6WK0Fgd/slnPoHOWSq1qAaUr4bIkA990dvfn1ujC4PNB76DsOl6QFuVLQacZjX2EgTUbO2cGQxNQUUT7wMWs6TdeGRoxcXWhzgI+NTNNN1rcug2v5Pa/AT5B1a2XnyGxvbsuHkjtFio+mJK3G+Za0OJ3BY+k5My/w34iQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663174399; 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=DWTMcgN+s3+EuJqXGUpffad3Z1M+TpIkfsiXcXLeD1g=; b=jm+MOfLsUfTuoPqY3O2Ibt+z7xqwCn2Apb1oouaqZG/czx2ZpJe9ScZY16UwC7ptzkiKbbwh6UtkrQnT/o/F5cgFsa/4HT5ido3pIxgp3fNVEQBv3Yty/r4vnivzbpw+5KjMcSo/3r0s3YocpOOjQNGbKPKeqVMSzs26LwQI4nA= 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 1663174399114208.3442992569902; Wed, 14 Sep 2022 09:53:19 -0700 (PDT) Received: from localhost ([::1]:40962 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVdU-0006Lv-NH for importer@patchew.org; Wed, 14 Sep 2022 12:53:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYUu5-0001Yr-Vr for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:27 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:37866) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oYUu3-0003s6-Qa for qemu-devel@nongnu.org; Wed, 14 Sep 2022 12:06:21 -0400 Received: by mail-wm1-x32b.google.com with SMTP id c2-20020a1c3502000000b003b2973dafb7so15830781wma.2 for ; Wed, 14 Sep 2022 09:06:18 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id az8-20020a05600c600800b003b27f644488sm17873716wmb.29.2022.09.14.09.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Sep 2022 09:06:13 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 205261FFD4; Wed, 14 Sep 2022 16:59:53 +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=DWTMcgN+s3+EuJqXGUpffad3Z1M+TpIkfsiXcXLeD1g=; b=Ph1JPh1dMEE5eQobms/jLe2+fk6fWBg0CszT4HZllGmwdfmOYDeo3kphug3O7IyBjU fOYgivkV8Fgfsiuji7ZYijyAqZSatxHoqm6e+jwHJVuR77dFZQjP0zFJ2xe7YcumSx8d erAp0L12FTd0PIFdUP3B/7lmeAgzA3XEP8dHTZQE4N7csgCMI1pZfQgXLhag2Kv/Ome4 gwgI3bwotPWcm+ItZn82mdfbShZ3vg6ooa3w+2dr0mtjxxfZQjY62SWZu+IqApALujoT oj2R1x+nG7JDSXwSNL0QA3Va3wPH/eMvjmeNFVYaalIom8G6lXHNbP04rhd/5hQG4Xpl 542w== 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=DWTMcgN+s3+EuJqXGUpffad3Z1M+TpIkfsiXcXLeD1g=; b=MtTsvp8V3bVIQmq+ARKhmcV7aE5qPL1k13y5W13J0uiebUi9jWSEPKxHhir5DXC/iC nWdHwuNGZeEndafi0Et4O/x5oFyzGs7qLXaKHjwYkbY29AOyP6Bdp5sCjzmI6cGF2bmB Y1ymRWngCXQ8OJZPJjAZ1Nobkgjf0QRm3DaEnOvhCvOsFNjnWHBhLvicM4FyJ0pRoaKa 9PoAFDXOJpJ5/OpdsdMmbrq7LN6IqiHr7yYudTtCONl5+KlUAEp9XrxRJC1ALJRbgGFQ Is2RAQn6JnuVxaFW1IlJASRBtEHFKnlHK4eQJ7cKXtJ2FuvGihevkpx0ZCp0m9YrGG2h nicw== X-Gm-Message-State: ACgBeo0w8Wb7bW/gl9jjvTY4fJGKGIrH/GggFu/BQUOpLxYzvXkgPqi8 Lann6ZAu9rbgeYzU2LXC+RJDbg== X-Google-Smtp-Source: AA6agR5WEF5pjZQ0lK3aS1TrfOkBIG/33rIS0/yss/IxGc+0YWnlHXIxx08tUlBf7CIFndfjqzI5hw== X-Received: by 2002:a05:600c:255:b0:3aa:2150:b184 with SMTP id 21-20020a05600c025500b003aa2150b184mr3782578wmj.138.1663171577374; Wed, 14 Sep 2022 09:06:17 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , Wainer dos Santos Moschetta , Beraldo Leal Subject: [PATCH v2 30/30] tests/docker: remove the Debian base images Date: Wed, 14 Sep 2022 16:59:50 +0100 Message-Id: <20220914155950.804707-31-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220914155950.804707-1-alex.bennee@linaro.org> References: <20220914155950.804707-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::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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, T_SCC_BODY_TEXT_LINE=-0.01 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: 1663174399880100001 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 Message-Id: <20220826172128.353798-25-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- docs/devel/testing.rst | 2 +- .gitlab-ci.d/container-core.yml | 5 ---- .gitlab-ci.d/containers.yml | 5 ---- tests/docker/Makefile.include | 8 +---- tests/docker/dockerfiles/debian10.docker | 38 ------------------------ tests/docker/dockerfiles/debian11.docker | 18 ----------- 6 files changed, 2 insertions(+), 74 deletions(-) delete mode 100644 tests/docker/dockerfiles/debian10.docker delete mode 100644 tests/docker/dockerfiles/debian11.docker 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