From patchwork Wed Sep 14 15:59:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605746 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp840964lth; Wed, 14 Sep 2022 09:05:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR754mizF7ZN9jaMkwrzU2QNRar48o/4PvOirToA2McEVF7fUkstoJvzdsaOUsvCjEsjt+65 X-Received: by 2002:a05:620a:13cd:b0:6cb:e443:e97a with SMTP id g13-20020a05620a13cd00b006cbe443e97amr20284534qkl.449.1663171538922; Wed, 14 Sep 2022 09:05:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171538; cv=none; d=google.com; s=arc-20160816; b=set6EiMepN4vtmQy15OhGpf9Hakp6ObPJiFSrfLoCaGYFCOVkhyM5FFeFzhR6UEj4q Gw2F1H90RM65mPFq/s9FhrmNsZ8u4TUPjvNfj8dAZA1zBrSp62nIV7ClKnQj2Q9hP9jx cOvQnMCseCe9M2F7w2jdTETYAHh4AR4vrtuzP+529njEJBmeGvuKvUqdQezCCRfcgVzi rLz84AEOCbMcE+J60BFIuKIOEfuJ5Cs3X5xJVw6cpcqG+Lux0rFvdvdVLhXgG5dqxSgh 9MwWg8dadofmMkTWa+mFuWUlALel6SoC/cmOr4N5mApZY7MotmX4CJhhKYwWssagBbtm /Ofw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jrKSxnfwgGSXnfdRpcO/7SXLAwMYVDBeU9cPTzC5/8c=; b=MpgaOGMbI4PWg7iFSsNfGSp6Fg2YwKFJ6UNCM69sWv+drHU8F0WkNhOp7I39gXL+94 TBecQHd6yC7XLcAKmSIP/OIMHXkjwKsK2sRZc8WphuC4iOEK9bICLftijpnRcMdt/uHO Q3o3QJ23OUwLUeTnQ52NYBntafSYWTsjHO1GaD76Gs2VoFyqsoDzTymPlqzRgshgl+Kd IKNzz7W4PjlcPq/0p1dFMtfnBAGTmrRqDUv4igBRrfPs9artO3TVS0nUBUSQYYZwbNai jKUfWKDV/Mlka/z5LQwaBxpr/JdPre4Z23OPEwRxILWBS0k45GN4ON6rzwyJk1YWQ0CP kmtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UeCFjwsZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id w11-20020a05620a444b00b006ce7d4e6c0csi1859591qkp.55.2022.09.14.09.05.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:05:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UeCFjwsZ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58512 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUtO-0006TX-EZ for patch@linaro.org; Wed, 14 Sep 2022 12:05:38 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We already limit the scope of the cross system build to reduce the cross build times. With the recent addition of more targets we are also running into timeout issues for some of the cross user builds. I've selected a few of those linux-user targets which are less likely to be in common use as distros don't have pre-built rootfs for them. I've also added the same CROSS_SKIP_TARGETS variable as is occasionally used to further limit cross system builds. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- .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=$PKG_CONFIG_PATH ../configure --enable-werror --disable-docs $QEMU_CONFIGURE_OPTS - --disable-system + --disable-system --target-list-exclude="aarch64_be-linux-user + alpha-linux-user cris-linux-user m68k-linux-user microblazeel-linux-user + nios2-linux-user or1k-linux-user ppc-linux-user sparc-linux-user + xtensa-linux-user $CROSS_SKIP_TARGETS" - make -j$(expr $(nproc) + 1) all check-build $MAKE_CHECK_ARGS From patchwork Wed Sep 14 15:59:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605745 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp840960lth; Wed, 14 Sep 2022 09:05:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR4BK5AUCkQBnZMreADUcOIzKfCc3BHAqeON+HlWgLghkjeYFBsid6HUlK0KQ7QEpM8QppGe X-Received: by 2002:ac8:59ce:0:b0:35b:a5e8:1ed with SMTP id f14-20020ac859ce000000b0035ba5e801edmr19720488qtf.199.1663171538756; Wed, 14 Sep 2022 09:05:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171538; cv=none; d=google.com; s=arc-20160816; b=Fli+NJQMKgP5Xx+b0/kvdC9vLSpup2rLKNCdkafELUgSJcSmYPyASH8SEZstzCnjRW a0NvegQwG6HtbyykuszQFrwavLErDuV3S9MxcVEenKnmftJzpsMSxQcCmcg73YVysEZa fJxUIniNHcjvLZPiJh8o0vSNNQ6KhoWEkk7NOSGixXyobrE7BHS7M8Zr/63WEIuNv8jJ v4IisLM74WvRx8XbKNPbqalsxoWSI+bv3XZd5ZFnLnFx+ZtTF0Ears1HJt9LAT+E97JN u1qicTkD1KYScc6x01MAnDqzDBcCrP43dRtZXIv4issQ+JJVfwSmP/0NrVOZ/XZS0qa9 xCSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=GkqXdvguCssbIQXu4uUN+R8nK9yQpERJYK56Jfq2cFU=; b=tCh8mMFICANkff0vc7bloLIoCJ/2RXLMRG9ZfXPIthzu3gVjwSGChQpHU5/lrLO41x cDPNQqkGIshh4qp3omktu7fMLtkPdIfkpw845/hThQkn2ukkaib+X6gxslik4FXq5iYX HcRWylv3vie7E7WjLJKV1yPDqviD6ZX77nkbLenpsH/jE0bi4NbCMm+RMnFHCkmJswZb BS1hWFWm9YV1pGxTCyup69jvS106ev1W4uDZyjD/ccFdEIOupBKqZXDs3MMd/we+Zvcy C3SjHGYLYvxukmUDmgZQeZ32HIyTUyDUU7rvE42jtMLmAIAzZrkU51dghG5qWoh4+sFa gnfg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fQ0qtgag; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f2-20020ac84642000000b00343a2da7372si1362911qto.69.2022.09.14.09.05.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:05:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fQ0qtgag; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58510 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUtO-0006S2-6y for patch@linaro.org; Wed, 14 Sep 2022 12:05:38 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth The assets that this test tries to download have been removed from the server. Update to a newer version to get it working again. Signed-off-by: Thomas Huth Reviewed-by: Alistair Francis Message-Id: <20220829080940.110831-1-thuth@redhat.com> Signed-off-by: Alex Bennée --- 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 = ('http://ports.ubuntu.com/ubuntu-ports/dists/' 'bionic-updates/main/installer-arm64/' - '20101020ubuntu543.15/images/') + '20101020ubuntu543.19/images/') kernel_url = images_url + 'netboot/ubuntu-installer/arm64/linux' - kernel_hash = '5bfc54cf7ed8157d93f6e5b0241e727b6dc22c50' + kernel_hash = 'e167757620640eb26de0972f578741924abb3a82' kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash) initrd_url = images_url + 'netboot/ubuntu-installer/arm64/initrd.gz' - initrd_hash = 'd385d3e88d53e2004c5d43cbe668b458a094f772' + initrd_hash = 'cab5cb3fcefca8408aa5aae57f24574bfce8bdb9' initrd_path = self.fetch_asset(initrd_url, asset_hash=initrd_hash) self.vm.set_console() From patchwork Wed Sep 14 15:59:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605751 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp845708lth; Wed, 14 Sep 2022 09:12:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR6cknOOqj7R0BYxaBCPXjrRgSv/XgVbz7u1orE4JgMGmLCuf+c+yYic/gNl5o58UIWD0xr6 X-Received: by 2002:a05:620a:c52:b0:6b5:467f:4f6d with SMTP id u18-20020a05620a0c5200b006b5467f4f6dmr28060692qki.503.1663171927560; Wed, 14 Sep 2022 09:12:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171927; cv=none; d=google.com; s=arc-20160816; b=g1iIniGEO7cLeWg+hL5AGd8Agl3p8+Js8XokX8lWbYE4NDp41VwXdxmMLoRTYAiw6w k2rrd4jnV8r2jGilIOg3kMkbQ31pGUittgHnPoaZShssC18dK57caruL8rbFZ+Q0as99 mFNlEjD4cZADHIaXJlQuSq5YBcSlcJ9+ga6qMLReNtCdjiUpxF+7qimqbRoN9yg5abcm kQnDNezZhlErEhX1jrJSJlmkzwWDpMWjT5LgYKzTB/YqWR0PAnwxEUHU2RsmcQgYDxPh cJEIvEZyvZjPwUU+DQgEVG0FlFNuOIWPCu5z2hKfeyfhhadfzJlzeTgutoaZOX4Rtj+E N0oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=HoXaq5wqa0NQD2yFNqfhg3M2YWScwtFEAMJcP4/Q/QY=; b=H1cxpwoRfNwiZJa1Vf9QHXFq21FOim6r2wPuGFbCW5RP4MA0rwIqRbmS52Jj+33sdw 5K4Oysdm/6yk8++5HKuirKqo+yA/BtJMK9HVzxgWL5ghbb6KWoDYk/uU+ZDM8SoZV4Cn X2ZN73KUGEioGdJBWKCcgZLjYllf7+lTmB/k1XkyfQ79kNFmoLOGeqeuz/S9jUd5sQN+ ZF6KLoYNsL5V8lKlv4T+Jgp5g3vHDyyk49qWYtT3eUD8Nyxn8/VuyM9fwhaJUATtfINZ 4uymq8N9io8DhKPER5n9Cluw2wQ+ze0B7pK7IwH39lXGAQ2rf9l04/xbf3sgYOwkUolZ LpXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XFBMLwiC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l13-20020a37f90d000000b006bbb1bce62esi1428071qkj.700.2022.09.14.09.12.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:12:07 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=XFBMLwiC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUzf-0005K7-2A for patch@linaro.org; Wed, 14 Sep 2022 12:12:07 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We don't want to rely on the soon to be reduced default time. These tests are still slow for something we want to run in CI though. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- 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=machine:virt :avocado: tags=machine:gic-version=2 """ + timeout = 240 def add_common_args(self): self.vm.add_args('-bios', From patchwork Wed Sep 14 15:59:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605750 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp845692lth; Wed, 14 Sep 2022 09:12:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR7jox8YvAGbcGiOvpgLPeiDZ9mMZNnQSGgqLLro5dnf/KawzdwRmV8c5jZ7PwKRT0YusJ02 X-Received: by 2002:a05:620a:4611:b0:6ce:6bcc:5586 with SMTP id br17-20020a05620a461100b006ce6bcc5586mr6110600qkb.71.1663171926584; Wed, 14 Sep 2022 09:12:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171926; cv=none; d=google.com; s=arc-20160816; b=WvxbW5Xg1//d5shnpiyPFvPdjUQR5mC5c3zxQAfyQa7TT6PszKLz/FkYvEfB1SxEWp KsQsBfGzXohPFY6uGOVarhSrZl2acYhANBKbgBZSqlrSGct8HvAoI6ZRbTohlw/OHJVH o5wHcR0pY4RDeP8lGvDKXxoQVdMIcb7ttR6WrnKl7jdpYcHvVswVu59bCb3erfPTDDTJ hI5ljKvxv/3vp+oJiB+2ok5TwGzD6Zzu0hg6uvThWRSFdSOA+HqMge39UG1HHpkp2vwC 2MZpmgf54zanFWN3erBtuTW2MUUVMEOynosbnaD/Klh0n+NnePjr9eXOP7FTkIijNFAY 14Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=XT2vSxrm0rHLngSQcFythecX2OgBlSa9qVvKO+2mI4o=; b=FVoOGUfSVkpjWf61M+T9gcIrl7rRGmvcXdLqrKsqPVnnppnKTfGKeYl3p38C9rvUzB D24SkaMO5APJkbinI2STvZJrsW9CBY/yBVh82+FDsboprdq1mxqY/uvG3KiBimdCMBJm p9V9G+YmAEwFqV87ov2k8Y2Ay6kVbgRbFxlv11B76Prf2Z5rSihKSEii9wOg1iXDrA3u P3ufrM/6DZ1fR/JyeM8HexRlo42dr0OFewupgyUaGOwrezIZAkaggofTKOIwTHA7QmCd D1XJrt2g1BpWxD+OPPZnwhb2sqL/fckJh3he6SnQ8I2Tm1T/qIA/BwnDpbhEKGx2Ix1U gNww== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xyMBXQaA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a14-20020ac8108e000000b0035c50be4605si1431905qtj.215.2022.09.14.09.12.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:12:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xyMBXQaA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUze-0005CE-3C for patch@linaro.org; Wed, 14 Sep 2022 12:12:06 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We don't want to rely on the soon to be reduced default time. These tests are still slow for something we want to run in CI though. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth --- 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=arch:s390x """ + timeout = 240 + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_s390_ccw_virtio_tcg(self): """ From patchwork Wed Sep 14 15:59:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605758 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp854280lth; Wed, 14 Sep 2022 09:25:15 -0700 (PDT) X-Google-Smtp-Source: AA6agR57WUDKdHSV6sfjGh12c3bHlRLRdvKgU2sQs6ARG85FL8nVeoV224mSeLaLx7SxDnsjh7/p X-Received: by 2002:a05:620a:31a7:b0:6bc:138:2828 with SMTP id bi39-20020a05620a31a700b006bc01382828mr27695409qkb.733.1663172715452; Wed, 14 Sep 2022 09:25:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663172715; cv=none; d=google.com; s=arc-20160816; b=ALDtwtfoxG1qhjyoURdphqPPLFwi8jptfJxmvfVE0hSb7FjWj7QZ7NA9aWCUgUgXuf smxctXxkgcUznPTtdu+vjUYFtqVWb60kQT1Vcb2145Uu7Hx9GE9Sjvx2otQkEVm6BlAg CWlKiWkOLZNiP5vJ+cE3rtOmYlcUJEAECGyautdvtiEMjDX9pnG1xz9IJ2+Q+AETrkw5 n3WhLRY5sNNzwwzgMTD/DQkVP6R4NLlw153+zdSNxECfhFdnmVhXBLLR2BV85UEfNjKs VtDrG+gXY8YnE5F0U5mQLXRvwX2ljqiR5Srs2yHpuO6Vc1sj235EsCsemUrwhtpNQFaW rMLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BknxQV6MVmcZavM1lYtAyUVlipzDOdv8QGgE/5Rl11s=; b=MlFDfgN60vwiV4jUB0ohCPs9E93PBY4B+sV7y94QOPctFcZc+GYipu3mV4qhWlAjqU NrKmWdMrjt+XIcABjHKrmKO/7NE/vKWftoXISCeHCZQfRCNy/H8RVSOiOPvauODS2a5I Q0jW5GAEAc1l8Z+qx9r9V6ApvPSR5z4iUzHl+DiSJEE8aFvPLWhqzTpHgSGmbaGuDebD GpUdP6H4agIsFopqwpzSaxQWS9+/BsC1ofA6TzmnTx8fKnGhMpLFdv7hmdi67ikKLaFN rCPjPcuLehW8q/hH/RydCZ8XkCeOWP2HN1Wq30bs0lkfEC0zyMMm8ggBG7rtYSxZcvaa jC1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="gtZ/owBg"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id ee7-20020a05620a800700b006cbce762157si1645733qkb.475.2022.09.14.09.25.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:25:15 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="gtZ/owBg"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:38204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVCM-0000OZ-S3 for patch@linaro.org; Wed, 14 Sep 2022 12:25:14 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We don't want to rely on the soon to be reduced default time. These tests are still slow for something we want to run in CI though. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- 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=arch:ppc64 """ + timeout = 180 + def test_pseries_tcg(self): """ :avocado: tags=machine:pseries From patchwork Wed Sep 14 15:59:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605748 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp841487lth; Wed, 14 Sep 2022 09:06:22 -0700 (PDT) X-Google-Smtp-Source: AA6agR5E0pWkQFQLkBzENAWJPvqrfQAVkuolM8OzbDj0nyaq0gQP4cEYyH9OsD7QS6yR//0extpk X-Received: by 2002:a0c:db05:0:b0:4ac:d6ad:379e with SMTP id d5-20020a0cdb05000000b004acd6ad379emr5737412qvk.121.1663171582310; Wed, 14 Sep 2022 09:06:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171582; cv=none; d=google.com; s=arc-20160816; b=dxU/PgPFiPuGo74RfLQ1P+yVH7VY0Z57eCEOM1+bR04E4y3FQSxwLZdonygwW71BUy TDvUlkla8Jn54UbzHd7ctorqArQB68llomSemRAxapbsnkxOBc8xqrfH3pkdpv/ndatp mlPM1n8eZILjDXk4tgn1Tt47Q0oz5YEjeltHpuRz/qSkGNzNCQEsdRo8NkrhvEQHJ5AA 8KQasabiwgvDqoZ/GZ+kP3awBW1H4wYsa5j6xZv2/EvRWzrCagLQbrU25yKVTQUWT4G9 PXeMKblUkDGC4btnsVlP3F1SQR4OG4H44KKf9KgTS44JbcS9+7y5AOkrbfydyxnfTLyZ Qtzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kZdq/uKjk12WdalK+7NLnICP9eMfFlhN/OCSVSt/d/Y=; b=LvSTgitZBXhT5HB8BRL3f2Z+hMDmjCBn65NOoGrjQhpl60zxGH10FU0nlEwCTgSUTI cPrWFFfj0MuaUSm01SK+OSxDu621m7XrFk5QLBu9kAxS6/DW6xS3fLB5yR2erCf14axk Fei0P4lh6ycHi11R8Fz/BJUcWkate2o2Ohfd5v7xCVB4+lWxyNSB7aKVFt0OM73KzVLZ UkrA10T4H10HvjWFrgEtYvhzr/Wg8zqH9kpT9hZOIk3W5OqqRA/OSyc/BoRDUppG9xlm fA/QPdtaFm721pGwuSfljnu+JB/lQs3VCUvqAM19q+0Q8Etz0YrlIZ04oQM0SYFfz6eU 0E7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iaC73sLP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y14-20020a05622a004e00b00342f823157dsi521129qtw.235.2022.09.14.09.06.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:06:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iaC73sLP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUu5-0006cr-Q2 for patch@linaro.org; Wed, 14 Sep 2022 12:06:21 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The SDK tests take a lot longer to run and hence need a longer timeout. As they run well over the 60 second maximum for CI lets also disable them for CI as well. I suspect they also suffer from the inability to detect the login prompt due to no newlines being processed. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth 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. import time +import os from avocado_qemu import QemuSystemTest from avocado_qemu import wait_for_console_pattern from avocado_qemu import exec_command from avocado_qemu import exec_command_and_wait_for_pattern from avocado.utils import archive +from avocado import skipIf class AST1030Machine(QemuSystemTest): @@ -176,6 +178,20 @@ def test_arm_ast2600_evb_builroot(self): self.do_test_arm_aspeed_buidroot_poweroff() +class AST2x00MachineSDK(QemuSystemTest): + + # FIXME: Although these tests boot a whole distro they are still + # slower than comparable machine models. There may be some + # optimisations which bring down the runtime. In the meantime they + # have generous timeouts and are disable for CI which aims for all + # tests to run in less than 60 seconds. + timeout = 240 + + def wait_for_console_pattern(self, success_message, vm=None): + wait_for_console_pattern(self, success_message, + failure_message='Kernel panic - not syncing', + vm=vm) + def do_test_arm_aspeed_sdk_start(self, image, cpu_id): self.vm.set_console() self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw', @@ -187,6 +203,7 @@ def do_test_arm_aspeed_sdk_start(self, image, cpu_id): self.wait_for_console_pattern('Starting kernel ...') self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id) + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2500_evb_sdk(self): """ :avocado: tags=arch:arm @@ -204,6 +221,7 @@ def test_arm_ast2500_evb_sdk(self): self.workdir + '/ast2500-default/image-bmc', '0x0') self.wait_for_console_pattern('ast2500-default login:') + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_arm_ast2600_evb_sdk(self): """ :avocado: tags=arch:arm From patchwork Wed Sep 14 15:59:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605755 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp849764lth; Wed, 14 Sep 2022 09:18:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR5RBI4rsfpno/rP756Wc7dzORp3YFCA5dVA8g+2YI1eNXhWV3CU07qP6d2qcEVORfHmM6HX X-Received: by 2002:ac8:5748:0:b0:35b:ac34:ff37 with SMTP id 8-20020ac85748000000b0035bac34ff37mr17926575qtx.630.1663172286098; Wed, 14 Sep 2022 09:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663172286; cv=none; d=google.com; s=arc-20160816; b=OaRfzmQOLCY7WGTluT8yRhuOjXzPmfCXqtx4rVDDjm4ur5JAZPRIQgGt4MaFNh0fo7 21+y2ZxVq6f26RNkgH+d6kazonnZKuht4wP5ZS3GSdoJkZQJ86plScnBBtgdepW7TU9U BjtrWdSdMgjwxtKmXez+87L7N7frALQd6vgOmSJhnEfrWoxqGNqlEwmheoFGiRajm53K wec7jD4j7k/8ysTVg4D2naEA6ppYjRJmbknjE0YGcTdKF+NJUprvtiF5Amh1mE4L6e5s wqWhPJA5aJAqy/qIyASO8J4xhmX2jWKeH6BUCUArAFbk9ke0L/JKHTcM/VdX+8zvB/s8 IBkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1f/7sfWBRdUlRKRIHXh6N9sBf3lAWvS8nOz1+E+gsL0=; b=Ar7FzEyzCXCJyoyu43yQ+OV1oUVldyXj/0EVaD+eB1wh/5yjwu5UkXTCXtGadDDF6J L55+sgWGnbTDsDQxhDUvpvJf/8iTKNsjqkq2i3aWBIc2vi9iElLVciI6EDgTwwd/GyJT d5pDVHLnVf75B9OWOWnNBJyBjYYu44uplFI8uvq5P3m7s9wwpANPZka7T5TQySGnFdhM yt0rk5q98Df4teosMjuluJuHitHTtsdQhStgVNu8hEMbFuyouQkDp7Fo6fPuIQDceKfS f3iQkVcLi/vIRPQu/5ZsiHT/KZ4hs+pP9c9VTZjG/V3WQH4I4HhMyn0By/37k9TjrCIq 6tXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jSBVLqQL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u9-20020a0562141c0900b00496e84c741fsi1686610qvc.121.2022.09.14.09.18.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:18:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jSBVLqQL; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39906 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV5R-0002lR-Hm for patch@linaro.org; Wed, 14 Sep 2022 12:18:05 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We should be aiming to keep our tests under 2 minutes so lets reduce the default timeout to that. Tests that we know take longer should explicitly set a longer timeout. Signed-off-by: Alex Bennée 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): # default timeout for all tests, can be overridden - timeout = 900 + timeout = 120 def _get_unique_tag_val(self, tag_name): """ From patchwork Wed Sep 14 15:59:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605754 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp849576lth; Wed, 14 Sep 2022 09:17:48 -0700 (PDT) X-Google-Smtp-Source: AA6agR6GBsDu28si4nyoJE/03EnjmqlyGnRCYGfblpJ9SgGOzJzB95YFyl/9PVhTPBah7lZRy0Rn X-Received: by 2002:a05:620a:4706:b0:6bb:7e1b:5f0c with SMTP id bs6-20020a05620a470600b006bb7e1b5f0cmr27046793qkb.340.1663172268549; Wed, 14 Sep 2022 09:17:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663172268; cv=none; d=google.com; s=arc-20160816; b=QEqb7mrG7qwDPQdgcv7lDyFGv3cnffk1jI+CL3NC4OgMqbIl/E/IGolMdFqtE+q0j/ Gd8EZOg6L0n/g+f91R/pFn/kW9WVs0m7oITtUHhJpowEXTRLefdp7o48yNa31qvqRzUL RzqnBDcP0eVLaYqLXiAWRkX5GfqEUkz311Y9UL/TA1zWswUI5uUQulco32mqzgSJMuG5 U/PNsZ14t/yabuwrP5UbKjZlobTkXQWttOLQ8AUBuIbG0vAtWpw4zO2ikjhhISrLhoE/ kGwmRJr+rG/Auk2NrNQqSBD9OWDwox/Ldfhh92aNTJAoV3IDDYVyTWq3/rQMSzbhXVzQ aARQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=oVg0gNUb1gnpWZ5Xt/ps9KGAmZPADE10X+KbFxU79pY=; b=X1tjyh2y94Et+zoWnheS8IHGpENaO0Bn+SfQNaLc61gQaul1QqwBIQVNd8gelVrWs7 MnSaG0Ji0jbC9MavBvPBsKgCEysimoOMkBTk0fnRhTMEX/BPQbtM0YiNw5a/3fBvk7NO Gsc4+VqaF0dfdqqCaYmEVxelgbdDnSbg+qz+C8vKQaX9bcOQI9bPq/pEw64kGeuRe3/f IL8OtSJrbKxJpkt51Ig9DVRanulbFHBinnDrLddkkHILVF1PAnKPfclSSeLLTlPOCkyN x//qp23ujDjNCZjhW1cGVSgSZm9s2IXBOC2drchgfrEnJKAyZTzWxq44GcQT93RQegfn D+pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=terdUEBj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f13-20020a05620a280d00b006b98e258b4asi1588634qkp.290.2022.09.14.09.17.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:17:48 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=terdUEBj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV59-0002ia-Ro for patch@linaro.org; Wed, 14 Sep 2022 12:17:47 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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-cross.yml index 505b267542..802e332205 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -1,7 +1,6 @@ alpha-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-alpha-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9a45e8890b..c565aa5e7b 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker index 10fe30df0d..4eeb43c78a 100644 --- a/tests/docker/dockerfiles/debian-alpha-cross.docker +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-alpha-linux-gnu \ libc6.1-dev-alpha-cross From patchwork Wed Sep 14 15:59:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605752 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp845722lth; Wed, 14 Sep 2022 09:12:08 -0700 (PDT) X-Google-Smtp-Source: AA6agR4/2XlkKvDYNvA7jKPt7YWDq7pXykXc/YhyynZ2tcscYMvpBLSDFQ1wEgxE3zsZeuQeMeB8 X-Received: by 2002:a05:622a:170d:b0:35b:a558:aee1 with SMTP id h13-20020a05622a170d00b0035ba558aee1mr20729032qtk.527.1663171928014; Wed, 14 Sep 2022 09:12:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171928; cv=none; d=google.com; s=arc-20160816; b=rVE9n8ApiFqbChXCTwLdJxKHuD5Xb/wniMtX6oKbueisQ9pujdTOFwn+y/zZw1I8Qg iypniUL6SGUhMKf0t2iQc4KEn/vPOBPEESPBhHqhJh8a95lY1UmMn1IL7/WtMKjM6EyT wBfPMaABIBE+O84rXDredyu5eGdPnoUTmaOylUizijl5bkgaomXQZe4eYA71qiyPMz2V H17CM1RH5ybreQ0Di3TbecR6yLt3QJiZFvsQ5lavp31cOySrr9YSEty0U9y9+dyMrV/q WRQ8+kmIwkLD+7ti1zq3rhyNR68LbZsbQiMx+UJe5eb3v3IyTBWNHohtqW0WxIgDIV5u LjOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IqaLr6BFu6QU3p+4N0XxulwHFk6+V+czeiV89fAmciE=; b=IjQ5xS0e6yfjmgTRO7PSssQuP3CpCICskOgsG2w0nu7vx6I6bhf3dChfJDHsoP1wvu cqbHPDL3V9Iv4uUKoKqFr7nIBgaO2BQqLwNTx2PZr/UmliK5V9X5QL7qWGR7E4MoDUOB uwhF2e88IIOYokEmzQ2xnFCrng+eIoLYKFYO1HHWQZuxVVlKTAj8hN64nTyzEjhdpd0u 2vOgJQvX3FwW/2Dm/S6ASnpRrap7yvQr9xbLGF4O0jSftp7F+fMxhpoDwS9YiGdebnwr e2G99NiueuZ9DH1n26Bf9Lk+s40YRfdy9cjwZvn1+b18GColtN0RbnntvmUvPcfsNY3B W9mw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cyK/SugH"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b23-20020a05620a0cd700b006bc1512988asi1223092qkj.572.2022.09.14.09.12.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:12:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="cyK/SugH"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUzf-0005H0-GK for patch@linaro.org; Wed, 14 Sep 2022 12:12:07 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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-cross.yml index 802e332205..6c1d765463 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -65,7 +65,6 @@ hexagon-cross-container: hppa-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-hppa-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c565aa5e7b..e39597d35c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker index 3d6c65a3ef..af1c8403d8 100644 --- a/tests/docker/dockerfiles/debian-hppa-cross.docker +++ b/tests/docker/dockerfiles/debian-hppa-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-hppa-linux-gnu \ libc6-dev-hppa-cross From patchwork Wed Sep 14 15:59:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605753 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp845752lth; Wed, 14 Sep 2022 09:12:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR71tCNV5U4cIN0g/3gvVE7rxIsZrkEwUQGoI1UQ1J61YT1HeEOy0TdfZF6CNiH1cCVc7olA X-Received: by 2002:a05:6214:e82:b0:4a0:cbae:2690 with SMTP id hf2-20020a0562140e8200b004a0cbae2690mr33933971qvb.81.1663171930553; Wed, 14 Sep 2022 09:12:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663171930; cv=none; d=google.com; s=arc-20160816; b=uQv4Px6CjvZCtCI3lgx45/HkZRMZx9dXV6v1hpm05y7kh2hUsyhgBe/+eXduazzcQG x9v17hplRt2tccKLFwXeo6DUrL2sPGDqzkinOqK2SnIDGhzaOS44yZ+WqFzwR+T30tDZ w8OpfT2sv9WzJC8iP62Bi12NIBh6nuSgySw+NMedbvz5mWbmW1mGXvzmzTverbwqrNLA hsfWaB5174/X5+stwNZ3jTAdYGNxDeKtp+PYmulmuYFI2aPARHFCxo4NdsqdUKdIMhnq +Ns2enKcUiimg1h6KzrzODNuOWM6SqKBSz8pOBWgIXTrbdWnRvsvDIGlBYHMT41QV9iK jfsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=qdSCb6s2r0EoqgxYjN+6ThvDdbhbHDOp2BpkY3tETSw=; b=atVf4CBSO5zz8yQtRIMqnWKIY14lPUWAj3jBdOLci9S7Qr5zsd/bQJI73MaWlliaGL 6VDu1EJPibcM0Sjp1nLHtu/hYrF/CESntOHjiX5JnLwdG3w9pju51I4CtODFGH2+inSR pgv3yFZ/ilcJdO7+Px4m1CIiv0d28xanaq9eZuNEVgNdekz284kjurLJUZJOcXn0qoWb YcQz0cl5RjRjfa+wtNzfy+oOysPy0h8eFDgXCwCNDAe2TFUgjCltcJI/6nJfC+gdRY2H xHOUp9E0z9u7vOcUYsGe50NCuZAOOxQ780jbFWulJYlKgy1M/XIi466NfBUS0nY3EaUl j3/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OY+DncQw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b7-20020a37b207000000b006b912c2e3f1si1486673qkf.154.2022.09.14.09.12.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:12:10 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OY+DncQw; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:34722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYUzi-0005MG-0y for patch@linaro.org; Wed, 14 Sep 2022 12:12:10 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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-cross.yml index 6c1d765463..15a5270f6d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -71,7 +71,6 @@ hppa-debian-cross-container: m68k-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-m68k-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e39597d35c..95790e974e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -88,7 +88,6 @@ DOCKER_PARTIAL_IMAGES += debian-s390x-cross DOCKER_PARTIAL_IMAGES += fedora endif -docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker index fcb10e3534..dded71c5d2 100644 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ b/tests/docker/dockerfiles/debian-m68k-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-m68k-linux-gnu \ libc6-dev-m68k-cross From patchwork Wed Sep 14 15:59:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605774 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp870937lth; Wed, 14 Sep 2022 09:54:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR7/CR/WTcUHuE4hGlxI/U2yhpXs0DK25PNryoe9KU7ouYiFKftmSX7xB2s7eUCKKYYZQ9nM X-Received: by 2002:a05:620a:4706:b0:6bb:7e1b:5f0c with SMTP id bs6-20020a05620a470600b006bb7e1b5f0cmr27171476qkb.340.1663174478448; Wed, 14 Sep 2022 09:54:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663174478; cv=none; d=google.com; s=arc-20160816; b=pX8ghTqrnD2Rga/qSYbjdHSdzLQEAZIx/ZfliL0ex+qTtdDC3JmoTpndT36GXTtPLg o+h0za54k882NLzjhR51h2Xao+7SCqWeM1Asb5wcDu0+g/sv+YS7t/8miM1bLogseOaA TbZPDit7XIQES+GDZzOxAy6znbCf2GCSRWXe5YObxoVNNs8ltLAWqNGw9/WPa7SCY+yc y+1rvFKgFYk70jSTzmNeAleUygaUYhw8RBX9B+JXYtwZRTvSfUU/FX5fA7PojfrsHYca BJ9ZYBj4Px3YFCzpniFbgydkwC7KsXIlUwL7bvTPb3QL4aMh9BnusA4WC6DufIEYIdWj VorQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=U2JzAVOHBmx2p6Y9jlhkKfmMcAlVs01DcSLL5ELzwk4=; b=txHqD2aLOzLaXTis/KCPNNQfhIIDphC9Kd3yFmvxoYWmDlDjZ9pGvwZM1OecaVcYRn tCwkKKFM7jlZkV8URTlTC2nzL/6CRd7YsQLJQrNQYbjwwrdnQyXc47gSgwRiszk8fWFO PWnQpWGHORrT0Hamm8ghliEIxYSllQ+KQ6c80qb7IhzzTPwwqBvdVJ7iVIIQRTyllQgP wXQxAjcNPhk8Pdm/jAEVGunpcIRqR3Dfv/JflLMWIaXOaw9ZFf3/B4xh25M+IJLpBUIV zGagSgVsKS7ItaZNltR9BDCIF9Clib5LO1jvbWymDC6wZg4zhbe7yF6HWm5yX+7/c87W kKKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QizJrc6m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p8-20020ac87408000000b0035baa2bd813si402201qtq.127.2022.09.14.09.54.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:54:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QizJrc6m; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:40976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVen-0006TX-Tp for patch@linaro.org; Wed, 14 Sep 2022 12:54:37 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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-cross.yml index 15a5270f6d..a3bfa483bf 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -77,7 +77,6 @@ m68k-debian-cross-container: mips64-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-mips64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 95790e974e..6c2ee3b175 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora endif docker-image-debian-mips-cross: docker-image-debian10 -docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker index 09c2ba584e..afcff9726f 100644 --- a/tests/docker/dockerfiles/debian-mips64-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-mips64-linux-gnuabi64 \ libc6-dev-mips64-cross From patchwork Wed Sep 14 15:59:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605757 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp849887lth; Wed, 14 Sep 2022 09:18:16 -0700 (PDT) X-Google-Smtp-Source: AA6agR5VsHTJxmlgWGkRAAqTWWZrAurNvLMkHfSYfltNKKoixaFjQbiNo3a8xgUne0QtkJ1jRwKT X-Received: by 2002:a05:622a:13:b0:35b:bb0f:e90a with SMTP id x19-20020a05622a001300b0035bbb0fe90amr10499399qtw.441.1663172296477; Wed, 14 Sep 2022 09:18:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663172296; cv=none; d=google.com; s=arc-20160816; b=Dw+IoE7ChRAx8gXsD0NazTDfJemycXdzL8JANpxcnWQE5dWmizi3zJX3dK8SbXIxQq SjReFRCiUGA9ujgZ7eQxZuGwPjOBFKN50uGA+VzXGaUlY/Fv9BY1+VSHAZUZAwW9pUhn GJYFhlhBvFPKfUYKwd6rdZCQ9jdVqvfftyyaCULS67IiSle1o9a+6BuMTzjNQRyLSIpe aiVz3tu3tUIXyOeXg1758iI6xtru1xeD25KqyJG4vylB9Qubl/r5BBiKu+JnZruSEIxk o+UiPRzI9Sfjw+XY4woccVpu2PJjXSxQmajHRXlE5Omulfim8MGNFizxGygcE1rXpcLv o81Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=MGW8Qx1J0PF0RJwo76xRbma2CeONhBpz+sH8ADGaVWQ=; b=YT3nvGDQYgws2/O19iW92nVhHQlc4+TPnIwLJy8ef3xAVLXx34fxjUt9UE2bvd69wv l58tre4Uc/KUPEaiOWOXU8qEoSMuun3DFabwL8/h1AAfg+1NBvY1cBPbEV+ptPrtJhRE mtP04evs5QndAENL7pTARXrVBpBjhtKBUfq2WvaJ4/z0ofeawMqrf0tkpM+douqEeq6S hsCOjD3MWQ9txnIF+NDU1ZNlQKOGZ9gjmQ9ppbi44s3k+Qh30+aErR/j7UQE241pMQ4p idYgsHYmrCKTL+I2hy/vCrydhxBk5/ajoxGQQFUAD/AinqSe3AxBj9x8xpc62jj4DmPa vRhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T/mxWEfU"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c12-20020ad45aec000000b00496c8fac4e1si1622742qvh.439.2022.09.14.09.18.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:18:16 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T/mxWEfU"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV5b-0003F2-VE for patch@linaro.org; Wed, 14 Sep 2022 12:18:15 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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-cross.yml index a3bfa483bf..8a611fc824 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -137,7 +137,6 @@ s390x-debian-cross-container: sh4-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-sh4-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 6c2ee3b175..37c4ea913f 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora endif docker-image-debian-mips-cross: docker-image-debian10 -docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 # The native build should never use the registry diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docker/dockerfiles/debian-sh4-cross.docker index fd3af89575..d48ed9065f 100644 --- a/tests/docker/dockerfiles/debian-sh4-cross.docker +++ b/tests/docker/dockerfiles/debian-sh4-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-sh4-linux-gnu \ libc6-dev-sh4-cross From patchwork Wed Sep 14 15:59:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605759 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp854523lth; Wed, 14 Sep 2022 09:25:38 -0700 (PDT) X-Google-Smtp-Source: AA6agR5PPbR42ifHzvnmtW5FmuQwikdJ3fjMfWuiss6UE/scBQPyY3Spcbo+1oPP/6SDmZSjc0bS X-Received: by 2002:a05:622a:143:b0:344:95bf:8f02 with SMTP id v3-20020a05622a014300b0034495bf8f02mr32284912qtw.202.1663172738093; Wed, 14 Sep 2022 09:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663172738; cv=none; d=google.com; s=arc-20160816; b=lXVSqXBjttQVedPcd5tOqV56d0BhA9woCVB0RX2YC91xDI8mtMS/SWeyZNd/R81hdZ R+oDBuEtSjKUba0NduVPORUckZkwsMEIpQ5ZM5ZQT+nJut5FJo94pd9zy54O1ED2lftp gRT1Cn1cnBL9IM3sEcfukq2tWrTQtDTu5+aYjXCQMFpMM0Noet4I3OQRp/e7IMQtJ3vt I87Mfbo3MvBWKyftyf5ubbbqW+DLmQ4H2ENWeUBSvnAZfAxHBtdJexJAIkYJ/4lo8wUe 8jhMqPB7YRCQHzUT+0L3niHj4TXCVsiL6vwM2wqLce4xYgtCrIG0cxwohz8vFyyCA39Z 5exQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=b37tM16YW2hM4J2q/2/cHZ/O4ghItjIzNOwocMzl0HY=; b=aS8ahwjMVgWx8zo8JSr/R6tXnhb6S28Vntl7IFlLzJoL2rXG3c42nKKxA3hsyqujvG mHsbTASOvoAK5tSWCLo3ecP8Z/UaRDB6M1FlfsuyWWsyqcSU7IWmHVOnTkwrPHNLyVIl YoeGOvSG6AMWOceSU63+BPDzjg7Lwj+wCpkRed5l10Tf8VPLPuAQfbF2tq87gIdUdECO 9sgPOwOIvIZhOz6fUrXiKufPupMb9t5kwaauM7ybgL5OBy3eC3tZgCCE+7ezE30CteFy K+RYQ+1feo3PYbLVtcLD2bnzmcbwYGR1NOh8ZZmFRqFUEbeSs6RFrM22x6rJxtl2U5Pc qMOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zi+DQhoS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id bj14-20020a05620a190e00b006b9286a63b0si1737703qkb.371.2022.09.14.09.25.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:25:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zi+DQhoS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51032 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVCj-0000lt-KO for patch@linaro.org; Wed, 14 Sep 2022 12:25:37 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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-cross.yml index 8a611fc824..db0ea15d0d 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -143,7 +143,6 @@ sh4-debian-cross-container: sparc64-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-sparc64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 37c4ea913f..8828b6b8fa 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -89,7 +89,6 @@ DOCKER_PARTIAL_IMAGES += fedora endif docker-image-debian-mips-cross: docker-image-debian10 -docker-image-debian-sparc64-cross: docker-image-debian10 # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/docker/dockerfiles/debian-sparc64-cross.docker index f4bb9b561c..8d3d306bc1 100644 --- a/tests/docker/dockerfiles/debian-sparc64-cross.docker +++ b/tests/docker/dockerfiles/debian-sparc64-cross.docker @@ -1,12 +1,14 @@ # # Docker cross-compiler target # -# This docker target builds on the debian Buster base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-sparc64-linux-gnu \ libc6-dev-sparc64-cross From patchwork Wed Sep 14 15:59:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605760 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp855735lth; Wed, 14 Sep 2022 09:27:26 -0700 (PDT) X-Google-Smtp-Source: AA6agR7NdNG8f/SKJZfh1UAuZy68YmuWL/7F36IdMMJAHGvcfFO8otVCor3Lz22itRKpmm4RodBV X-Received: by 2002:a05:622a:1b92:b0:35b:b7b3:6ddf with SMTP id bp18-20020a05622a1b9200b0035bb7b36ddfmr12156296qtb.223.1663172846545; Wed, 14 Sep 2022 09:27:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663172846; cv=none; d=google.com; s=arc-20160816; b=n97NOXc+bwn2uSWvAJda5+OrHNkpeANw1x/1hQKH1O/aOhjP/NzwXMZ2lDVcdgH1gJ VUblMEtxhb5nFxMAl0jqzEnYpvzJTpvDq+iRf+mvfXLwEovbwpTNRfLPELiY6J7jcagI VmN1ktUDU/r3iWxpNiea/ESeppqzRgmYfhO7bfInZSnABTC03CT/Gmvf2ASk00rbUghZ KT+lDFL+1FBp67XiMEE9ewTRQ2hgWr6Z+LtjuCJRVr7/WwJw6/PZIReYPgQ6yB5iOTb4 ewTnbXvhbKbw1fNeugq2eJ0H+9CwZPq9Af+mNWaF9sSm4nksGWznIvdgy3/1Qe0wBsYO HznA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3e20V6KO3fnSe6hV5y58MKOdP3MKisUIItuiv04/Bkk=; b=K33YoRwllcyECmPW1GCxq4yeinCyk3Gknjb+YYkAtKqEVJwe5NSy9KKi8Kq1G+1ShU rFxwkCij71xulLd1VXRJdINZ3kZ6zjVwCexT48WzNMdOyV62lJ1zcrR1z9NCRjpid4UW FhV6c+Ap123QxkT9WSP4bvcIz5ywu0wdtgiaWIiEqjQbnHurJLKF3R75id8Y0hRAW6ZQ LXfaLk/HNC43QhE1CuveUiyWVASOuRSLLt2y9kPWa33Phjw/kJVrsM07g8+2wuT7Gozo 9U/UpzhWpwewObXTlrfPcMYuNMFU+Lpjvi84X8FMrVnL8Ll0b4CT1VF4PwW+6e9yZH9t 4sFw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wov5x4qy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 6-20020ad45b86000000b004aa5e02f02asi1381569qvp.411.2022.09.14.09.27.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:27:26 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wov5x4qy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:51588 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVEU-0002un-2C for patch@linaro.org; Wed, 14 Sep 2022 12:27:26 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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-cross.yml index db0ea15d0d..67bbf19a27 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -102,7 +102,6 @@ mipsel-debian-cross-container: powerpc-test-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian11-container'] variables: NAME: debian-powerpc-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8828b6b8fa..e034eca3af 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -137,7 +137,6 @@ docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 -docker-image-debian-powerpc-test-cross: docker-image-debian11 docker-image-debian-riscv64-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker index 36b336f709..d6b2909cc4 100644 --- a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker @@ -1,13 +1,15 @@ # # Docker powerpc/ppc64/ppc64le cross-compiler target # -# This docker target builds on the debian Bullseye base image. +# This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian11 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-powerpc-linux-gnu \ libc6-dev-powerpc-cross \ gcc-10-powerpc64-linux-gnu \ From patchwork Wed Sep 14 15:59:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605762 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp859400lth; Wed, 14 Sep 2022 09:33:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR42Jr24ss8krtyFC2FdViaOD4TqnO4jWej0pyDdjgfAQEA6zpXCPEr6CEbx0ER0s+xzRU9k X-Received: by 2002:a05:622a:590:b0:35c:b9ca:a3cf with SMTP id c16-20020a05622a059000b0035cb9caa3cfmr3380926qtb.90.1663173193116; Wed, 14 Sep 2022 09:33:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173193; cv=none; d=google.com; s=arc-20160816; b=IWMWMEQHgTJQauIy1mbMPp1nLOCBuMnAbalT+rpLBuM4+VwTL/gAid7iTMBrUnaQgK T6THW6z+q/F98op4UyESNcLeRu4VKZGeeKOWEtzNh4zXQ0yfI4ubWmme3xXATTPPFApg 2duAfMjy497jkMMIelHYRkhyndanK7k4fDIXvtQtPuIqEUVueocH/ci+EejJU3ueqtRk cCKz3viJ7Gw630KGs1E12+cv7PKIEP1txBGiFz7SCuawGtPNvlQQE7+LcW94Ih3aadLy 0iUJx/GAjiC5guxjASXJTNLZBl/M36B+r/vOJ/2WfgS7JYYgZLVq9SRESumKIddWGCFa JqRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Kz7cAUufaTnZbTesKWGFYDQNhU7/ZM8fW5VV1gae+ts=; b=bDNeTR5aRNiUly0ao2rrCOObL46uiZEArwveuDfjk1Aer2aMihVrxjsLdoRNchzuXW zqR8W6JSqPT2+pbb5Gmd3Jd4z75KtuxyaDtdJIyQJ6opdo1fb6DnYh/Vok9SbRjLf7ij 5+gizEv2Y0z9bTAPspUOMqQTa1SVOrsP6GAhV3TuEGsf3hPtfY1bUovxWpSmsLJbEN5i agPJT+ilg4q6/CTW35Xbf/tQvftEkbsLmh5z/iII0evSfOziS+Dj0Hsc5I5Dem8cVAAq UUy7Rsy0brQwBn0x789hHRL5EJwKuj0/CMfcHXBxnu1z55eTEeLPhffKLX8e81ndjy0B gQtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SeIErpG0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q4-20020a05620a0d8400b006b4811cfa51si1760732qkl.763.2022.09.14.09.33.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:33:13 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SeIErpG0; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVK4-0000YA-IH for patch@linaro.org; Wed, 14 Sep 2022 12:33:12 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We missed removing this dependency when we flattened the build. Fixes: 39ce923732 (gitlab: enable a very minimal build with the tricore container) Signed-off-by: Alex Bennée Fixes: 39ce923732 ("gitlab: enable a very minimal build with the tricore container") 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-cross.yml index 67bbf19a27..611c6c0b39 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -148,7 +148,6 @@ sparc64-debian-cross-container: tricore-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-tricore-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e034eca3af..5c9398bbc9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -132,7 +132,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # Specialist build images, sometimes very limited tools -docker-image-debian-tricore-cross: docker-image-debian10 docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 From patchwork Wed Sep 14 15:59:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605756 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp849842lth; Wed, 14 Sep 2022 09:18:12 -0700 (PDT) X-Google-Smtp-Source: AA6agR7xqciAfoPIRzCvZGqPca7+QMFF+MjpVXVCN/bXlCEIr3tP6VceyguSvL+zal/pP9GSgnxL X-Received: by 2002:a05:6214:19c2:b0:4aa:9e70:cff3 with SMTP id j2-20020a05621419c200b004aa9e70cff3mr32730157qvc.49.1663172292751; Wed, 14 Sep 2022 09:18:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663172292; cv=none; d=google.com; s=arc-20160816; b=0tT7FPa3zNF7fVWCarvIVKV+iNf7YralRLNdX7mjo5GYN3udi9K4PuwYRziSh/RtHO JlxCFVn1C3m2oqEKQ9vuuGklXzCjRMjTLBM8AqWcVy5jdleBjXXMjV5AtRJDzjIqxLoK LgU2YASf2mJqX4vDj9tfHTR9sw5MaLo83J2NshKOIJNXeXS7xM0faOKujOm7yR+XmQmw m1f2x5E79EkbMZC5dVsWGHQeEMf9rkXFVrKeoS5KwpRoellD/b98cw5nWueLosnNhJBf DZGU132tniVKIM8QrfVu2F9sl/gsSbgBVg78pQHKeJPpvkKP6TCBg0bp1seEAkYuqfNM rTDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1H7BYOsMjX27yWey90pXEdizOhBIsoyHQ4lOXwgMOZo=; b=LH662ElQnlh+TjuV18T0Lg668rlKg6owYymuHsqrb29S2LNqSchsEL/SJGwsFaKkoo UsEIiSceiGma5T3/hJQ3jTf+4VGHWqTvjcAmfZ1jhCz1M2CyS+rUS0csHWwDp6toHzG0 4LEgtZOwQScY+qyg5NNZ+X8weFWAuvqv/EwF8CgwMycj3aG1eMX+x8Ih2q6Upz/etvpq wTcnTNDbzWD6+8HJA0mBvq8M4zA3cae4G0777YNKvCACd8FaxXJB8TrLwmtA34qvyHWz pmtO44RysvyHiI6Sxvra+ql5gxhnmUbX/H6fqHr2LrIFULx5zf/y23LJQ/w0TG/gVIpI Egbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lqxovLHu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q6-20020ad45ca6000000b004990214be0csi1627079qvh.422.2022.09.14.09.18.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:18:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lqxovLHu; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50118 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYV5Y-00032o-0G for patch@linaro.org; Wed, 14 Sep 2022 12:18:12 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We missed removing this dependency when we flattened the build. Fixes 9e19fd7d4a (tests/docker: update debian-amd64 with lcitool) Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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 := debian10 debian11 ifeq ($(HOST_ARCH),x86_64) -docker-image-debian-amd64: docker-image-debian10 DOCKER_PARTIAL_IMAGES += debian-amd64-cross else docker-image-debian-amd64-cross: docker-image-debian10 From patchwork Wed Sep 14 15:59:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605761 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp858267lth; Wed, 14 Sep 2022 09:31:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR7G6f7bkzTXxbV8+BI04IQhjc+U7Kd+32QioU6qsSS0fG2NBL3hIcPnI3s8WPlJHNXsZgx4 X-Received: by 2002:ad4:5f8a:0:b0:4aa:a2c9:2f28 with SMTP id jp10-20020ad45f8a000000b004aaa2c92f28mr32759389qvb.90.1663173087517; Wed, 14 Sep 2022 09:31:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173087; cv=none; d=google.com; s=arc-20160816; b=HNaCtE0L6i4fY0kODv8MEmWYfmVMa//50SVvZWBUz3cIfXhvMnc6tNpZmfPzkZt7o9 YR/QxI09R7JI56SRN/j21V3+v5likkIv/6C7ZysRKGCLBhPXYSVityVy5ACcUPE2aiy/ 4E49Eql+NjBXQnc6F/956/zWGJARSK6vf/d2b2MGqK0KS0Vs00vIEjvTV0LK5lf0TtJD Lxzhna/T1B25i98Y8QMu+Gx5Whe6b2454ZYFC/upxXiG8zwwtpm5RlCB6gg/nVX+uGkx eRYWP6j/IqT8BcxBx9O9P5t4Jl9vzDA+7q5Q8+deMHy64OUXQIoVe2+qNvsX8cDQsAGp VftQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=RABVHmGwM4Y3Zb4Tdf8GWAG2GTowADZu9ETtNAlNjQA=; b=OaB5YPYwNYxPL4HkjjrSrVRAtooFFvv0lZVu5XDxSFVXhlj8OhRLsQKN6IKEGqzMfv y8DEXtogqNwCaF2BvhJXeGbQaW1gaJqmeV0KBeA/rUFHKOZaocv/FmZI+cym0DcPtysf jKhBi6QNMMQronCKoHEgZ57E9l2HYp7K4msf6N9o0by9GhO+z5HEh8M5gN+N1G6pnITe orSsb8oRI5pMpKuySOmMgL8TaJEFE+N+2rxxH2jxkOLIudGG+YrLdAqIrmhq7qQMRqC+ 2sGrH592BC74TKcm7jvytEasOcW+qOd9QnmJ0kudtGXbtm21HyjAw0JLzuTX7dfFIRda ZFcg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MLlokei4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id i21-20020a05620a405500b006b5cbaa5b3csi1563391qko.655.2022.09.14.09.31.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:31:27 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MLlokei4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49634 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVIM-0006jV-UX for patch@linaro.org; Wed, 14 Sep 2022 12:31:26 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=C3=A9?= =?utf-8?q?e?= , 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Thomas Huth It's still based on Fedora 30 - which is not supported anymore by QEMU since years. Seems like nobody is using (and refreshing) this, and it's easier to test this via a container anyway, so let's remove this now. Signed-off-by: Thomas Huth Message-Id: <20220822175317.190551-1-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <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 EFI_AARCH64 = $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd) -X86_IMAGES := freebsd netbsd openbsd fedora haiku.x86_64 +X86_IMAGES := freebsd netbsd openbsd haiku.x86_64 ifneq ($(GENISOIMAGE),) X86_IMAGES += centos ifneq ($(EFI_AARCH64),) @@ -45,7 +45,6 @@ vm-help vm-test: @echo " vm-build-freebsd - Build QEMU in FreeBSD VM" @echo " vm-build-netbsd - Build QEMU in NetBSD VM" @echo " vm-build-openbsd - Build QEMU in OpenBSD VM" - @echo " vm-build-fedora - Build QEMU in Fedora VM" ifneq ($(GENISOIMAGE),) @echo " vm-build-centos - Build QEMU in CentOS VM, with Docker" ifneq ($(EFI_AARCH64),) diff --git a/tests/vm/fedora b/tests/vm/fedora deleted file mode 100755 index 12eca919a0..0000000000 --- a/tests/vm/fedora +++ /dev/null @@ -1,190 +0,0 @@ -#!/usr/bin/env python3 -# -# Fedora VM image -# -# Copyright 2019 Red Hat Inc. -# -# Authors: -# Gerd Hoffmann -# -# This code is licensed under the GPL version 2 or later. See -# the COPYING file in the top-level directory. -# - -import os -import re -import sys -import time -import socket -import subprocess -import basevm - -class FedoraVM(basevm.BaseVM): - name = "fedora" - arch = "x86_64" - - base = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/30/" - link = base + "Server/x86_64/iso/Fedora-Server-netinst-x86_64-30-1.2.iso" - repo = base + "Server/x86_64/os/" - full = base + "Everything/x86_64/os/" - csum = "5e4eac4566d8c572bfb3bcf54b7d6c82006ec3c6c882a2c9235c6d3494d7b100" - size = "20G" - pkgs = [ - # tools - 'git-core', - 'gcc', 'binutils', 'make', 'ninja-build', - - # perl - 'perl', - - # libs: usb - '"pkgconfig(libusb-1.0)"', - '"pkgconfig(libusbredirparser-0.5)"', - - # libs: crypto - '"pkgconfig(gnutls)"', - - # libs: ui - '"pkgconfig(sdl2)"', - '"pkgconfig(gtk+-3.0)"', - '"pkgconfig(ncursesw)"', - - # libs: audio - '"pkgconfig(libpulse)"', - '"pkgconfig(alsa)"', - - # libs: migration - '"pkgconfig(libzstd)"', -] - - BUILD_SCRIPT = """ - set -e; - rm -rf /home/qemu/qemu-test.* - cd $(mktemp -d /home/qemu/qemu-test.XXXXXX); - mkdir src build; cd src; - tar -xf /dev/vdb; - cd ../build - ../src/configure --python=python3 {configure_opts}; - gmake --output-sync -j{jobs} {target} {verbose}; - """ - - def build_image(self, img): - self.print_step("Downloading install iso") - cimg = self._download_with_cache(self.link, sha256sum=self.csum) - img_tmp = img + ".tmp" - iso = img + ".install.iso" - - self.print_step("Preparing iso and disk image") - subprocess.check_call(["cp", "-f", cimg, iso]) - self.exec_qemu_img("create", "-f", "qcow2", img_tmp, self.size) - self.print_step("Booting installer") - self.boot(img_tmp, extra_args = [ - "-machine", "graphics=off", - "-device", "VGA", - "-cdrom", iso - ]) - self.console_init(300) - self.console_wait("installation process.") - time.sleep(0.3) - self.console_send("\t") - time.sleep(0.3) - self.console_send(" console=ttyS0") - proxy = os.environ.get("http_proxy") - if not proxy is None: - self.console_send(" proxy=%s" % proxy) - self.console_send(" inst.proxy=%s" % proxy) - self.console_send(" inst.repo=%s" % self.repo) - self.console_send("\n") - - self.console_wait_send("2) Use text mode", "2\n") - - self.console_wait_send("5) [!] Installation Dest", "5\n") - self.console_wait_send("1) [x]", "c\n") - self.console_wait_send("2) [ ] Use All Space", "2\n") - self.console_wait_send("2) [x] Use All Space", "c\n") - self.console_wait_send("1) [ ] Standard Part", "1\n") - self.console_wait_send("1) [x] Standard Part", "c\n") - - self.console_wait_send("7) [!] Root password", "7\n") - self.console_wait("Password:") - self.console_send("%s\n" % self._config["root_pass"]) - self.console_wait("Password (confirm):") - self.console_send("%s\n" % self._config["root_pass"]) - - self.console_wait_send("8) [ ] User creation", "8\n") - self.console_wait_send("1) [ ] Create user", "1\n") - self.console_wait_send("3) User name", "3\n") - self.console_wait_send("ENTER:", "%s\n" % self._config["guest_user"]) - self.console_wait_send("4) [ ] Use password", "4\n") - self.console_wait_send("5) Password", "5\n") - self.console_wait("Password:") - self.console_send("%s\n" % self._config["guest_pass"]) - self.console_wait("Password (confirm):") - self.console_send("%s\n" % self._config["guest_pass"]) - self.console_wait_send("7) Groups", "c\n") - - while True: - good = self.console_wait("3) [x] Installation", - "3) [!] Installation") - self.console_send("r\n") - if good: - break - time.sleep(10) - - while True: - good = self.console_wait("4) [x] Software", - "4) [!] Software") - self.console_send("r\n") - if good: - break - time.sleep(10) - self.console_send("r\n" % self._config["guest_pass"]) - - self.console_wait_send("'b' to begin install", "b\n") - - self.print_step("Installation started now, this will take a while") - - self.console_wait_send("Installation complete", "\n") - self.print_step("Installation finished, rebooting") - - # setup qemu user - prompt = " ~]$" - self.console_ssh_init(prompt, self._config["guest_user"], - self._config["guest_pass"]) - self.console_wait_send(prompt, "exit\n") - - # setup root user - prompt = " ~]#" - self.console_ssh_init(prompt, "root", self._config["root_pass"]) - self.console_sshd_config(prompt) - - # setup virtio-blk #1 (tarfile) - self.console_wait(prompt) - self.console_send("echo 'KERNEL==\"vdb\" MODE=\"666\"' >> %s\n" % - "/etc/udev/rules.d/99-qemu.rules") - - self.print_step("Configuration finished, rebooting") - self.console_wait_send(prompt, "reboot\n") - self.console_wait("login:") - self.wait_ssh() - - self.print_step("Installing packages") - self.ssh_root_check("rm -vf /etc/yum.repos.d/fedora*.repo\n") - self.ssh_root_check("echo '[fedora]' >> /etc/yum.repos.d/qemu.repo\n") - self.ssh_root_check("echo 'baseurl=%s' >> /etc/yum.repos.d/qemu.repo\n" % self.full) - self.ssh_root_check("echo 'gpgcheck=0' >> /etc/yum.repos.d/qemu.repo\n") - self.ssh_root_check("dnf install -y %s\n" % " ".join(self.pkgs)) - - # shutdown - self.ssh_root(self.poweroff) - self.console_wait("sleep state S5") - self.wait() - - if os.path.exists(img): - os.remove(img) - os.rename(img_tmp, img) - os.remove(iso) - self.print_step("All done") - -if __name__ == "__main__": - sys.exit(basevm.main(FedoraVM)) From patchwork Wed Sep 14 15:59:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605777 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp877289lth; Wed, 14 Sep 2022 10:04:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6061ZPodMsJseZBf+QY+GzRk/kAgDUtFm+HJiDZH3dnPmwtsaundXDWS88utWpG4eWEQf7 X-Received: by 2002:ab0:2106:0:b0:3bd:27cf:e95f with SMTP id d6-20020ab02106000000b003bd27cfe95fmr1213934ual.30.1663175068870; Wed, 14 Sep 2022 10:04:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663175068; cv=none; d=google.com; s=arc-20160816; b=I8WuyFwenSwWi6Pck0W3aJj496MYcye3v68pdB83YPatN7c3gdRsMMH3vT9DUfdqta ifqYPdj7//ALAW8Ttu9BAfxIQGbSMrE6voup2yI6Qtkm6c+XRPzsLeMeu9dKv0fF068G vmTN3dSBYPWnDudAy1w2cKTaNgmnqXM55dLgKBdY/W6RWf3y4IB64UOa0roK1TQTMJlZ qGyYH8TLiMWVJsPMLdfZPG89BJntnAISxFRo/mxfL5As3QpBNkxnSIVC77v1sYWjxnbd pRhvJ+sVlpojfPvJKqfGs/INCgeLMXXuNyL1KWSRPR3Tw9z4eSfiq/9rNnucBVxznhkN IN/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QTQr9TtcMW+CLdYuqmZS0eZEFv1TYRf+0Q4Vht/BZfk=; b=DDLdI2RTSsV8Rua8PNwMK9IlyxAyO9vbxhOrLsyOYjfJUxf1rutU9MblWGCCxQT1hV ITgTF0o3wn5mTNWKyJSpgtySyWDS+rvOfPCV5V1Yo5M+ZBpmAUtzaHS9nXSZm0T4AIZb B//N8gnHq2S4+umh/rqnwblYumxwAlwwORKcf+7qpS5JkMA8vn18neLpImpD9WdPErTu MxjMFyBOM6vmgo+uYRIHXz7Wmf9VrukXh04wyggs8KlT5WX7orHXaU3RK6ll8efcUhA2 8wJuAnp/Q5g+9Fi9/0GMHNk5UeUvHz3p0IuZKySjg8rRtzOsFdxC0jVUny+wD/Cmw/5i fIxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Vn/onk6+"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q9-20020a67d789000000b003983a274b0esi321136vsj.265.2022.09.14.10.04.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 10:04:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Vn/onk6+"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39232 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVoK-0001my-BA for patch@linaro.org; Wed, 14 Sep 2022 13:04:28 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is working around current limitation of Meson's handling of --disable-pie. Signed-off-by: Alex Bennée Cc: Paolo Bonzini Reviewed-by: Richard Henderson --- 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="no" fi +# 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" = "no"; then + QEMU_CFLAGS="-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 From patchwork Wed Sep 14 15:59:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605764 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp862610lth; Wed, 14 Sep 2022 09:38:44 -0700 (PDT) X-Google-Smtp-Source: AA6agR61MTL+n9jPXPEGIc8MrVdWuJaZXbTMNCqGFxJgvtbwcR6q7WQg2BiG/Di3d9/R+aiMURb0 X-Received: by 2002:ac8:4887:0:b0:35b:b08d:20ad with SMTP id i7-20020ac84887000000b0035bb08d20admr15771793qtq.118.1663173524456; Wed, 14 Sep 2022 09:38:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173524; cv=none; d=google.com; s=arc-20160816; b=YrI8YBkpjOh3ftoiTuGETfLJPDrXgMuOTPUZtCDn5tPPMkWuqwCS9n+SJByA6Zg9uZ +cQ8lBS9EewsW4Dn6o4BHMlqKjYXjZF2795pxoz2HULBSC76VmX405bGDxxFbmKbidH1 AWzJdpS15s5E8yB3DLQ3vLtuc/8P9qLiT3LWK2k4JiNC371v7azLa/i0/eITpE/0wvDJ 73ubYJfQZzbyJEsrFhZgJgx1X6mwnthhuyXkJMyih50lLaR1QVX/G1prxawbfjc+B2p1 UUA3SZ9lHcKyVDYKMkO579YSPkdsKTqwhMRQS5x3uZgINMFmGO1UZwvRQqA0O7Py/2Z4 tm1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YtututB/HwLz66Zj57eTsQrfGdUZAAhyrcZh+dfp8lg=; b=of/92HtE9+JI30RVb04V8Go8H/yDV7+TwW+idD/EYMiYupMRpdldPMElnXDz9CxcR4 dDB7fdfqBDKjSZWzHo3CY6T9MnMhTJn7+EoWXKTfGnyDAhzy2eocy7WWhAry2PEQoigU ESpR9HpAj4oeXIfrYs8XtEgpJS2cNxYT1hr7rc7qNl0Hh9VL7HFR6iRL5WPuXxMi4LH/ BKkfqI3Za82DsMbqPWJuxk124md+TRnQjvhxDKsAgDfDShVXRb4Gde+MLSGgzPAb+P9o opZar5Og5NIcWIr6Dp1dr67NlcpUXWcBrrND41S1GTCafRzHbZKupOR2fxArP2joLa7W MyYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e8qhptXI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id kl11-20020a056214518b00b004a909c4b69fsi1436282qvb.368.2022.09.14.09.38.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:38:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e8qhptXI; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:42030 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVPP-0004az-Vq for patch@linaro.org; Wed, 14 Sep 2022 12:38:44 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson The project has reached the magic size at which we see /usr/aarch64-linux-gnu/lib/libc.a(init-first.o): in function `__libc_init_first': (.text+0x10): relocation truncated to fit: R_AARCH64_LD64_GOTPAGE_LO15 against \ symbol `__environ' defined in .bss section in /usr/aarch64-linux-gnu/lib/libc.a(environ.o) /usr/bin/ld: (.text+0x10): warning: too many GOT entries for -fpic, please recompile with -fPIC The bug has been reported upstream, but in the meantime there is nothing we can do except build a non-pie executable. Signed-off-by: Richard Henderson Signed-off-by: Alex Bennée Message-Id: <20220823210329.1969895-1-richard.henderson@linaro.org> 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 those libs in distro supplied packages - mkdir build - cd build - - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh + # Disable -static-pie due to build error with system libc: + # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 + - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh --disable-pie || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 From patchwork Wed Sep 14 15:59:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605770 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp867670lth; Wed, 14 Sep 2022 09:48:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR5LRCFzFh3DQXBr3AOQrHkMtpqR21kT7bfD4pMnEXktnuzceQVsehJ4KqiRtAFp7qkf6h1j X-Received: by 2002:a05:620a:2588:b0:6c9:2daa:9c6d with SMTP id x8-20020a05620a258800b006c92daa9c6dmr27316295qko.630.1663174099295; Wed, 14 Sep 2022 09:48:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663174099; cv=none; d=google.com; s=arc-20160816; b=dsekeT4q+15UlfUGz0CSy128e+OjYhQE6aKy0k3QwfN8Wa8keyCeVXegm9sfNoYijt tSbeSZZq3Ws7rjbFAsUvjCb1999IKKom4SMD3HFPpI/Ua+X+wQKESwnr51ZY7wSM0oAh XK9dYMyNcl/r3GOyAqd6EX+hvgM+KI6CD5gw+r0H9u647S+A+6joRaBGa5TcKyYPxjWK Gq1GpKU8W3ugn80RYJTzgkl2TL8I1Rvo98GjUL0T1vFOh35IRvyCJaav3GOya1g+7Zuo bicdvZhQEPLny6uc4UOmAWIqZQm99MjoCsrUsBA+FuSCSlyki9rF1buET/96sBnmeukF ircA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jW/HxwR3uoodS8LJxL2VV8mYc4s1IlkDnlKZ+eLVdLY=; b=hYq7S5rYlcg0qX7PMPC5ligSkhcHDsigeSGxyLulpjSHdUb88O1/FJu2JKwLN6mPv5 uI53FkQtweIoeWz3kUyu+MVPnk1/TznC0+guXvPNQKlHFVi+Z2+qid+2vLXHwzvdOb2B jJFiHuf6CwYBgnWLC7m3ZTHumDrOiPa+449WJrL26aI2VT/hkC5iVpPR7fDT9xLU8rGS PCQ1skes6PUJ9rmrmhsb5cx7EP6XeFpKS3vzeXPwYtJWEMNo8PTveXsUKJMZcHS687rB uPTh2ACyfEsHvo4Qfcq3HohRPvfuT91somfBpuNPq9qdVG3xxh6hHdegMwuTNgPefl6X Ky1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G6wDpVNA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f13-20020a05620a280d00b006b98e258b4asi1636277qkp.290.2022.09.14.09.48.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:48:19 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=G6wDpVNA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVYg-0007cD-ON for patch@linaro.org; Wed, 14 Sep 2022 12:48:18 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The custom runner is now using 22.04 so we can drop our hacks to deal with broken libssh and glusterfs. The provisioning scripts will be updated in a separate commit. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20220826172128.353798-15-alex.bennee@linaro.org> Reviewed-by: Thomas Huth --- v2 - fix extra-cflags merge conflict - update MAINTAINERS --- .gitlab-ci.d/custom-runners.yml | 4 +-- ...4-aarch32.yml => ubuntu-22.04-aarch32.yml} | 6 ++-- ...4-aarch64.yml => 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 => ubuntu-22.04-aarch32.yml} (86%) rename .gitlab-ci.d/custom-runners/{ubuntu-20.04-aarch64.yml => ubuntu-22.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: include: - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml' - - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml' - - local: '/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml' + - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml' - local: '/.gitlab-ci.d/custom-runners/centos-stream-8-x86_64.yml' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml similarity index 86% rename from .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml rename to .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml index cbfa9cc164..1a2f9b8dbe 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -1,12 +1,12 @@ -# All ubuntu-20.04 jobs should run successfully in an environment +# All ubuntu-22.04 jobs should run successfully in an environment # setup by the scripts/ci/setup/qemu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 20.04" -ubuntu-20.04-aarch32-all: +ubuntu-22.04-aarch32-all: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch32 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml similarity index 82% rename from .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml rename to .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml index 3f4dee4f86..ce0b18af6f 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -2,23 +2,21 @@ # setup by the scripts/ci/setup/qemu/build-environment.yml task # "Install basic packages to build QEMU on Ubuntu 20.04" -ubuntu-20.04-aarch64-all-linux-static: +ubuntu-22.04-aarch64-all-linux-static: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' - if: "$AARCH64_RUNNER_AVAILABLE" script: - # --disable-libssh is needed because of https://bugs.launchpad.net/qemu/+bug/1838763 - # --disable-glusterfs is needed because there's no static version of those libs in distro supplied packages - mkdir build - cd build # Disable -static-pie due to build error with system libc: # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1987438 - - ../configure --enable-debug --static --disable-system --disable-glusterfs --disable-libssh --disable-pie + - ../configure --enable-debug --static --disable-system --disable-pie || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 @@ -26,11 +24,11 @@ ubuntu-20.04-aarch64-all-linux-static: - make --output-sync -j`nproc --ignore=40` check-tcg V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-aarch64-all: +ubuntu-22.04-aarch64-all: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -42,17 +40,17 @@ ubuntu-20.04-aarch64-all: script: - mkdir build - cd build - - ../configure --disable-libssh + - ../configure || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-aarch64-alldbg: +ubuntu-22.04-aarch64-alldbg: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -60,18 +58,18 @@ ubuntu-20.04-aarch64-alldbg: script: - mkdir build - cd build - - ../configure --enable-debug --disable-libssh + - ../configure --enable-debug || { cat config.log meson-logs/meson-log.txt; exit 1; } - make clean - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-aarch64-clang: +ubuntu-22.04-aarch64-clang: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -89,11 +87,11 @@ ubuntu-20.04-aarch64-clang: - make --output-sync -j`nproc --ignore=40` check V=1 || { cat meson-logs/testlog.txt; exit 1; } ; -ubuntu-20.04-aarch64-tci: +ubuntu-22.04-aarch64-tci: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -105,15 +103,15 @@ ubuntu-20.04-aarch64-tci: script: - mkdir build - cd build - - ../configure --disable-libssh --enable-tcg-interpreter + - ../configure --enable-tcg-interpreter || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` -ubuntu-20.04-aarch64-notcg: +ubuntu-22.04-aarch64-notcg: needs: [] stage: build tags: - - ubuntu_20.04 + - ubuntu_22.04 - aarch64 rules: - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/' @@ -125,7 +123,7 @@ ubuntu-20.04-aarch64-notcg: script: - mkdir build - cd build - - ../configure --disable-libssh --disable-tcg + - ../configure --disable-tcg || { cat config.log meson-logs/meson-log.txt; exit 1; } - make --output-sync -j`nproc --ignore=40` - make --output-sync -j`nproc --ignore=40` check V=1 diff --git a/MAINTAINERS b/MAINTAINERS index 1729c0901c..738c4eb647 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3724,7 +3724,8 @@ GitLab custom runner (Works On Arm Sponsored) M: Alex Bennée M: Philippe Mathieu-Daudé S: Maintained -F: .gitlab-ci.d/custom-runners/ubuntu-20.04-aarch64.yml +F: .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +F: .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml Documentation ------------- From patchwork Wed Sep 14 15:59:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605776 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp872757lth; Wed, 14 Sep 2022 09:58:22 -0700 (PDT) X-Google-Smtp-Source: AA6agR5iTe/RGTp446Ptm3/z1hQZFtOaZhizRs8tFNPqAJZGncIiFnuA1YgXlk7/GXCOGFyVDHLc X-Received: by 2002:ac8:5755:0:b0:35b:ef17:fe08 with SMTP id 21-20020ac85755000000b0035bef17fe08mr7966965qtx.126.1663174702537; Wed, 14 Sep 2022 09:58:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663174702; cv=none; d=google.com; s=arc-20160816; b=QAJCNY0o3YTGbAQinyEwvXCmGh/r4jQAwq8oNzyMnvd6RS0CFbk0wbYQYqCcaTkAwl 3vjyNliibiHa311qhijTeXlloeYWcfqU4d/k1tSLKIf+6o0+4J70BPlTLgrM0M8SupUL wj2/WwMPHsRvY2//waKyIeSCZev17a/Rj5wcD+H+TVBVxPhBwky1pBoYT18PA2Ou+IlO 8bztYHdEZVPe/4bqjwwKKe/6nuW4Hp1FR4LCC5jfB+yR08XzLT8G0JAB0b6wfcVZpoA5 Cj4YkMrl7jGgguYV7f+SLkrwq/2685Gnzq+jFYUjwYUwU4n0peORhBiyODIQg9uZBqK8 wBJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CjorgUKQ0wAJREnGajqwiUqGdPFKd/Yke5pdcIHCgJA=; b=dU9ro+KQHtKY7s7rw4Yu7BV/4nKrin9B9CCoiPKdpiqusPl60c2Sk/fgDIlJumM8yi yPbiiV80vPJ4ZkkmMzdau0eccae3CH4lpUy4+RM8mQTXhTryspb+f9TBuGgSM8y1w6PN AxtLhKPwrEupNGoiXYQjmlro9nLBgOEM6NuQLiWVJ3bUrWg5FlWr9JXvVu59YUpgAilo n+wUmZyrIYELgJMr6OEuMzpCHJrbhEbgyZ4ULECSgBpXPKV17OvOMFY6LHBTk3MauNlg pvqr67v2euz5lL/qL+qn/lsxb8pUwPsVmXrNsriAaJiZDnhaBQcX0nCUaPkOI+AB+AMT 6x5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T/qhnq9I"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gf10-20020a056214250a00b004ac89567aeasi1535212qvb.558.2022.09.14.09.58.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:58:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="T/qhnq9I"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35410 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYViP-000481-VJ for patch@linaro.org; Wed, 14 Sep 2022 12:58:22 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Flatten into a single dockerfile and update to match the rest of the test cross compile dockerfiles. Signed-off-by: Alex Bennée 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-cross.yml index 95d57e1c5d..3a8bd75473 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -122,7 +122,6 @@ riscv64-debian-cross-container: riscv64-debian-test-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian11-container'] variables: NAME: debian-riscv64-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index b1bf56434f..24cd44e667 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -133,7 +133,6 @@ docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 -docker-image-debian-riscv64-test-cross: docker-image-debian11 # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker index 1d90901298..e5f83a5aeb 100644 --- a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker @@ -3,10 +3,12 @@ # # This docker target builds on the Debian Bullseye base image. # -FROM qemu/debian11 +FROM docker.io/library/debian:11-slim -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ gcc-riscv64-linux-gnu \ libc6-dev-riscv64-cross From patchwork Wed Sep 14 15:59:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605779 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp880171lth; Wed, 14 Sep 2022 10:08:32 -0700 (PDT) X-Google-Smtp-Source: AA6agR4lTOYOXQCvpXssqP4AOCA5fqXwgcYPh3Mf41258kQ4PgOjjosN9WY2VGOxOf6AQOZxzjcc X-Received: by 2002:ad4:5f4c:0:b0:4aa:7121:7a with SMTP id p12-20020ad45f4c000000b004aa7121007amr32201523qvg.63.1663175312091; Wed, 14 Sep 2022 10:08:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663175312; cv=none; d=google.com; s=arc-20160816; b=JQ5XTNaN/fsen4z3aAO/DGtm6zNQOWfI+x2fsYbR4HCFkc+/Dmewu9GQ5cIjOLW76r T1pGpUg09IynqTR6kqRKAjXIx7rbbuePt17CH1H+vcXIrSrD3RcgAs+qlMzennkkshad ist2d4g3GrsJE8t76mTUejM50hULnFmufZe9gjQq9oa0exq6q6JduS7akWyCXkVfJDWy DsfKt5HnLJiQ2mm+H3cqUpFlSPl6zSPI/2vmpRlCENKOv8sT7lbLvfX1e05ZsDwNHv6W knmt8ijngWdgxOlcYKukMze2ZgH6g4grKfLXLLljILCgMkkNYBxlF4UmycIiE8iYzftC 2+cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YliCTsRpMw4ev/s9tqMpyIV52FVHUEOsSSKUVnWbVIc=; b=pQpWvs+GrxPtDurMUJ6uD0JCnYQz8uN/60HW21HpPrzsIex91F++R6qTO1bf/15LTi LECEG4pRaFvevx8KHEHSX2eBboAbG1hVBAETYdojUzNCA1LirWH/MODiTaEdmB262fAN 7Wul23y9rJwGGYhMbPk4V5zmawiv59pDVSL/GnSOFMMzx39/hQpLxiqMyiKe5ehEE2AO Rmqh/+4HZj2UWzKUW8UDWiUQGd0Vh1nw9fcWmb/o/Xj08USIFMRmG7+Wz7buKf7dr0+F 5SmUI4IFfIvYDZ9mBUi/n3mJI1rZSm3Rl/aQET2SpdcpJ1T0Y8GbCuZv75MBsfZk5giv JN6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sjwCTR7P; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y14-20020a05622a004e00b00342f823157dsi646801qtw.235.2022.09.14.10.08.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 10:08:32 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sjwCTR7P; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVsC-0008WH-4J for patch@linaro.org; Wed, 14 Sep 2022 13:08:28 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We also need to ensure we install clang as it is used for those builds as well. It would be nice to port this to lcitool but for now this will do. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth 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-cross.yml index 3a8bd75473..091c0d8fcb 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -14,7 +14,6 @@ amd64-debian-cross-container: amd64-debian-user-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-all-test-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 24cd44e667..ddcc502049 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -129,7 +129,6 @@ docker-image-debian-nios2-cross: $(DOCKER_FILES_DIR)/debian-toolchain.docker \ $(call debian-toolchain, $@) # Specialist build images, sometimes very limited tools -docker-image-debian-all-test-cross: docker-image-debian10 docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index dedcea58b4..2beb077fb4 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -6,16 +6,24 @@ # basic compilers for as many targets as possible. We shall use this # to build and run linux-user tests on GitLab # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim -# What we need to build QEMU itself -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ apt build-dep -yy qemu -# Add the foreign architecture we want and install dependencies +# Add extra build tools and as many cross compilers as we can for testing RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ + ccache \ + clang \ + git \ + ninja-build \ gcc-aarch64-linux-gnu \ libc6-dev-arm64-cross \ gcc-alpha-linux-gnu \ From patchwork Wed Sep 14 15:59:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605769 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp866640lth; Wed, 14 Sep 2022 09:46:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR5+YK7Q0hrEFIxO66vEEO6pnS/wXMjZ4Hhetg7JGoJHQ89Pi/gmz+pq/Qx9De6Y0g9uPdRo X-Received: by 2002:a37:a9ce:0:b0:6cb:bdee:c971 with SMTP id s197-20020a37a9ce000000b006cbbdeec971mr23272884qke.520.1663173981558; Wed, 14 Sep 2022 09:46:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173981; cv=none; d=google.com; s=arc-20160816; b=vnpVrCNI0BTLPd1UqyBRawc4ruziFjBxEsBtf1W6gKtIMOjHPAS9+GIThU0Vhy7H9b NHFy9V8MGKtgwyUJfKA9F//pkmSK9qf1vDE9WzAEz2hN+am9VJgPcuEh87j6O+fViTmS IiMHfYc0+l2Ofdxb7zYJMGF9wleH2C/V/uFHGbjP/uQSiu2njKYGWcnjdH2Dt5+JrU4A Xnppr9e+cGznGgDS3VjiBppXeTrSmefQTbUoE57bZDWMRor3WOCrvxiJQ3fE/Vt0OJgF OJUxrgmULECl5kvyJq5UD05H/oJR+AlyC7IAs925aDNKMMGixueJS2u9eMWk3oN8HuXZ ib/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DOBOInzSt+enCwl0nSHMUZYxdD3wfdAmUMtGktSPyVQ=; b=H6Yjp4RABZH4gIvhiWHY0BPvrYMPWWEo57wEalo9pEQVV1A9jYcv6sMcO0F/9zjaX1 OKoAn/9H7+8rj9cbq44AD4r5jLQRul57xRtMW2XoF/IUFmdBR2xP3sM5BEOxXRAqhcFF tsnKHdSJtY+D5N+1hZLFD1h2cJpuvFZfI1GKwfxM6tZXW6H9Zim5nX/36uJDhRHAHG9m LWmFs7rkYGFPhYV5GR/Zu5eqU1HO5W9HY8IuvAADB590DsFKhNnTk28WkwMg2xWi5WTs LkArTH+oA1dh+x8hef0uzh7KZyly3Sw6nrmFQBUTD8XEfYNxrmTTIW6BcMMhKh6ptBGy 2ITA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ms2OlgqP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cq7-20020a05622a424700b0035b8c96d89bsi517920qtb.164.2022.09.14.09.46.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:46:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ms2OlgqP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVWn-0005XL-0m for patch@linaro.org; Wed, 14 Sep 2022 12:46:21 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We need this to be able to cleanly build the x86 cross images. There are a few minor updates triggered by lcitool-refresh including adding "libslirp" to the freebsd vars and opensuse-leap which will help when we finally drop the slirp submodule from QEMU. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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/freebsd-12.vars index 8fa5a320e9..1a5959810f 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/freebsd-13.vars index 8ed7e33a77..5e5aafd7e5 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE='/usr/local/bin/gmake' NINJA='/usr/local/bin/ninja' PACKAGING_COMMAND='pkg' PIP3='/usr/local/bin/pip-3.8' -PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gmake gnutls gsed gtk3 json-c libepoxy libffi libgcrypt libjpeg-turbo libnfs libslirp libspice-server libssh libtasn1 llvm lzo2 meson ncurses nettle ninja opencv perl5 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 047a435ab5..041cf9c1ff 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -66,6 +66,7 @@ RUN zypper update -y && \ librbd-devel \ libseccomp-devel \ libselinux-devel \ + libslirp-devel \ libspice-server-devel \ libssh-devel \ libtasn1-devel \ @@ -127,7 +128,7 @@ RUN zypper update -y && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 99803b343b..e1f4ed7c80 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -137,7 +137,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -RUN pip3 install meson==0.56.0 +RUN /usr/bin/pip3 install meson==0.56.0 ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 324355cf62..e3712b7912 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 324355cf62e86fb551408575afb123bac989ac37 +Subproject commit e3712b79122180fdb3b7a7ea8cbee47ece253f97 From patchwork Wed Sep 14 15:59:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605766 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp864929lth; Wed, 14 Sep 2022 09:42:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR60/C4JCmMHTrO+yEzvWnFd5NLFd2UG+bxCrz9jMqkJNYWMFu34pRDgWf1Sd32zpS7cHWjU X-Received: by 2002:a05:6214:2a82:b0:4ac:a4b7:b688 with SMTP id jr2-20020a0562142a8200b004aca4b7b688mr17819515qvb.75.1663173771448; Wed, 14 Sep 2022 09:42:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173771; cv=none; d=google.com; s=arc-20160816; b=qnuhtiDoBk8JS0cJRGcd7UlfMa42Jydb3ATUYhCSEec88wwGnqO+G2tETh7L08/wNR TNeY28rVPS7GdLz12JSkU0TWADCApKgt7WsZDSYUmiiLnKvwvBrFzc3xWjJ8htxXQj6g 59u6XCXbRCKuGSrKxxKHFgXlNjr5eyyFA7/Fq5W3rKkxPeDKz7PuxchskkspgJJpQxwU ZRdan8SUyoTR+JW1roScrG9Im3249iogIzPH+gn7C0kQTJc899Ss438OhdgGyG17jX1F 5YFvk1aV327fowSVnUKqTdgutuCPj76kUsVd3PI1bqo3bXviEBGOpue6Z2jPCf1dDtFt lapQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ECDuZFyCXgxzb5T4QRP2tWAs5cywxGurwT3H7qt6mNg=; b=i4qXCC+zjY82mTEu/HkZdvHBbTyHLhwoL9leZHMMS93Pactj5H/DKS9CyjIJv/3IQt YPfEVPY6Jhh0sRb9rpXwymECVMhH5htJ0zYprRCw6X533zKVnFk31+0IR0ey40yc4NJ7 bnWQWbRLx92JaKFDU3pSPDlV5oB3cjktMz2/tTR6LX/6aAEE0gmhUOckAhwf1cLnoGhj PiEcElWrfHbcfBOiQcaJ5ck680vT561G9f9KMJX1vdRuJeCGxkJ9LKKgYxBqTVXFLfV+ SBKh1KgIhkg5O7REc8AQHuLxHpyp6G1X/El51aOQsVgvEFsH2DkLL48EUFwuss2/tIvY R5qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=t7EN3ZD5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l3-20020ae9f003000000b006cbbc3daab6si1341602qkg.517.2022.09.14.09.42.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:42:51 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=t7EN3ZD5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVTO-0001Wa-Ot for patch@linaro.org; Wed, 14 Sep 2022 12:42:50 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now lcitool has support for building a x86_64 cross image we can use it for this. Signed-off-by: Alex Bennée Acked-by: Thomas Huth Message-Id: <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-cross.yml index 091c0d8fcb..2d560e9764 100644 --- a/.gitlab-ci.d/container-cross.yml +++ b/.gitlab-ci.d/container-cross.yml @@ -7,7 +7,6 @@ alpha-debian-cross-container: amd64-debian-cross-container: extends: .container_job_template stage: containers - needs: ['amd64-debian10-container'] variables: NAME: debian-amd64-cross diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index ddcc502049..a0f5109628 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -75,7 +75,6 @@ DOCKER_PARTIAL_IMAGES := debian10 debian11 ifeq ($(HOST_ARCH),x86_64) DOCKER_PARTIAL_IMAGES += debian-amd64-cross else -docker-image-debian-amd64-cross: docker-image-debian10 DOCKER_PARTIAL_IMAGES += debian-amd64 endif diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 870109ef6a..7d2feb7bf7 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -1,22 +1,168 @@ +# THIS FILE WAS AUTO-GENERATED # -# Docker x86_64 cross target +# $ lcitool dockerfile --layers all --cross x86_64 debian-11 qemu # -# This docker target is used on non-x86_64 machines which need the -# x86_64 cross compilers installed. -# -FROM qemu/debian10 -MAINTAINER Alex Bennée +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + bash \ + bc \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libpcre2-dev \ + libspice-protocol-dev \ + llvm \ + locales \ + make \ + meson \ + ncat \ + ninja-build \ + openssh-client \ + perl-base \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + sparse \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + texinfo && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -# Add the foreign architecture we want and install dependencies -RUN dpkg --add-architecture amd64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - crossbuild-essential-amd64 -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt build-dep -yy -a amd64 --arch-only qemu +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture amd64 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-x86-64-linux-gnu \ + gcc-x86-64-linux-gnu \ + libaio-dev:amd64 \ + libasan5:amd64 \ + libasound2-dev:amd64 \ + libattr1-dev:amd64 \ + libbpf-dev:amd64 \ + libbrlapi-dev:amd64 \ + libbz2-dev:amd64 \ + libc6-dev:amd64 \ + libcacard-dev:amd64 \ + libcap-ng-dev:amd64 \ + libcapstone-dev:amd64 \ + libcmocka-dev:amd64 \ + libcurl4-gnutls-dev:amd64 \ + libdaxctl-dev:amd64 \ + libdrm-dev:amd64 \ + libepoxy-dev:amd64 \ + libfdt-dev:amd64 \ + libffi-dev:amd64 \ + libfuse3-dev:amd64 \ + libgbm-dev:amd64 \ + libgcrypt20-dev:amd64 \ + libglib2.0-dev:amd64 \ + libglusterfs-dev:amd64 \ + libgnutls28-dev:amd64 \ + libgtk-3-dev:amd64 \ + libibumad-dev:amd64 \ + libibverbs-dev:amd64 \ + libiscsi-dev:amd64 \ + libjemalloc-dev:amd64 \ + libjpeg62-turbo-dev:amd64 \ + libjson-c-dev:amd64 \ + liblttng-ust-dev:amd64 \ + liblzo2-dev:amd64 \ + libncursesw5-dev:amd64 \ + libnfs-dev:amd64 \ + libnuma-dev:amd64 \ + libpam0g-dev:amd64 \ + libpixman-1-dev:amd64 \ + libpmem-dev:amd64 \ + libpng-dev:amd64 \ + libpulse-dev:amd64 \ + librbd-dev:amd64 \ + librdmacm-dev:amd64 \ + libsasl2-dev:amd64 \ + libsdl2-dev:amd64 \ + libsdl2-image-dev:amd64 \ + libseccomp-dev:amd64 \ + libselinux1-dev:amd64 \ + libslirp-dev:amd64 \ + libsnappy-dev:amd64 \ + libspice-server-dev:amd64 \ + libssh-gcrypt-dev:amd64 \ + libsystemd-dev:amd64 \ + libtasn1-6-dev:amd64 \ + libubsan1:amd64 \ + libudev-dev:amd64 \ + liburing-dev:amd64 \ + libusb-1.0-0-dev:amd64 \ + libusbredirhost-dev:amd64 \ + libvdeplug-dev:amd64 \ + libvirglrenderer-dev:amd64 \ + libvte-2.91-dev:amd64 \ + libxen-dev:amd64 \ + libzstd-dev:amd64 \ + nettle-dev:amd64 \ + systemtap-sdt-dev:amd64 \ + xfslibs-dev:amd64 \ + zlib1g-dev:amd64 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/x86_64-linux-gnu-gcc'\n\ +ar = '/usr/bin/x86_64-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/x86_64-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/x86_64-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'x86_64'\n\ +cpu = 'x86_64'\n\ +endian = 'little'" > /usr/local/share/meson/cross/x86_64-linux-gnu && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-gcc -# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV ABI "x86_64-linux-gnu" +ENV MESON_OPTS "--cross-file=x86_64-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-linux-gnu- ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 2a59150322..fc604d8a21 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -119,6 +119,13 @@ try: # # Cross compiling builds # + generate_dockerfile("debian-amd64-cross", "debian-11", + cross="x86_64", + trailer=debian_cross_build("x86_64-linux-gnu-", + "x86_64-softmmu," + "x86_64-linux-user," + "i386-softmmu,i386-linux-user")) + generate_dockerfile("debian-arm64-cross", "debian-11", cross="aarch64", trailer=debian_cross_build("aarch64-linux-gnu-", From patchwork Wed Sep 14 15:59:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605768 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp865847lth; Wed, 14 Sep 2022 09:44:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR76kbf9tMvjeNxmMPle90ky1wHBJ2tC7MNzQD5c4M8jpXKM2ly+SIW8tSRmEDPx2y7xHgLt X-Received: by 2002:a05:622a:5ce:b0:35c:b73b:59f5 with SMTP id d14-20020a05622a05ce00b0035cb73b59f5mr6352132qtb.541.1663173890894; Wed, 14 Sep 2022 09:44:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173890; cv=none; d=google.com; s=arc-20160816; b=C97DLsDqFOKCmx4l1813jVhKXrAUuR2XH19qzjsKNl9KrjhdUf9Bd6s+xH+OcFE8Ha hFWlg8jxzzE3MCy0PqcpG3n+cJKkyjRbAva9AwtF6f0M2mkmvQSWQJ57EQn1axVmXwV6 tbWGtxdkAHsl2kCYbQ/AQx43WGjiWlcsFWV6EmJpSoLJ3fI7MIVPLfcXxcZFGDhZOk8O tfZuvjKi1QtpnJx9x+nOeB9Klp3ESFpO0MUMsK9kfByxzCY9GK+X1taum0k28ufDsnAt aqCctNC+e9F2AMtbX4le10d0tUJX1LqoiFvwHfKC8C9wpEv7XVT4FNK660+Ph0ffMmYZ WNew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3C+bQmjL1wvLGpweQJ8MbVcrOXpM16i/PFvvqaa7Mdk=; b=nuWuLNtlkTrNzQUeqoF1wp8W3lxi5rypmrIDsqQTTWDbMBWWwc65JReyricBBBQDKB xGUlkGpFciPnJMJGg9XISwVOxAYrwM6DJ00xUxmbFKMf/fFf5U5uL9pPPhgOFQpgFkaa 8Q0TX6s1ZjjXHBaf7G0u2a+e9/8tXyw4cgEooD6SjinL28KO98wy+w+hFf2ZhGVvCmNc ga7mMpLBJ1k6O5Q5LaS8c7ZAU/D49VNAKFSJ19j3xsQbtElf4J2lxMlXSmhZy0tb9G16 j9QqnO9AGApEdejmsm0NXPuXHUVoBtPTLXPoiUsNVwEulX11P+RkWTg0Eo6JUd+oBqjh thgg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GZnXILYS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z11-20020a05622a124b00b0035cb953186fsi1446762qtx.423.2022.09.14.09.44.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:44:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GZnXILYS; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:59058 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVVJ-0004Cb-0o for patch@linaro.org; Wed, 14 Sep 2022 12:44:50 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile. We really don't need the rest of the stuff from the QEMU base image just to compile test images. In this case it is a binary distribution of the toolchain anyway. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <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)/debian-toolchain.docker \ $(call debian-toolchain, $@) # Specialist build images, sometimes very limited tools -docker-image-debian-loongarch-cross: docker-image-debian11 docker-image-debian-microblaze-cross: docker-image-debian10 docker-image-debian-nios2-cross: docker-image-debian10 diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker index ca2469d2a8..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/sources.list RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ From patchwork Wed Sep 14 15:59:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605767 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp865468lth; Wed, 14 Sep 2022 09:44:04 -0700 (PDT) X-Google-Smtp-Source: AA6agR5OlPwxqLUWPjlg9vBIDA8hZ2nFxn75cnYGqlxGlWGHzkEvMkNLuH+H6dkIksv2XK1uercC X-Received: by 2002:a05:622a:513:b0:35b:b42a:9bf1 with SMTP id l19-20020a05622a051300b0035bb42a9bf1mr14523995qtx.339.1663173844532; Wed, 14 Sep 2022 09:44:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173844; cv=none; d=google.com; s=arc-20160816; b=Z2uoX7bL3tocQPUy8eaqw6Y//I27WgxWeqsVTJzMQ3r/5oLKrMCIFvcjLscJyiy9LB Gs4KFvbRkBFPExK2GCvl5CAiH6cCUVP8hCOBHMZ4OtIdWp8M98F2idIGNNmXnQOZhk2R NNRGP/GTlSYtJ1WnKb5w4WOQqUuuifj9cgnNaWmrOTbeMDXJNRwuQ2mutYSGM5fLUZHi +U/a/3a5QGfH2Fks327eN0gWS54msS4d9YZrdsUSy3RBlmxFzx5WnLz1ZqW6fjTbtdGH R87auF+/4zASmfgxir4aWqjcC+3FA/RMkMnlAVKq18Vnw3VgX6Eyzh2iEMx/dVwtPSCg /2NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=sndVtu5XcqEXirLEG2n7a84U7O29s/uHZwqERDBcl2k=; b=KZDZFLlmYhT2f28a/vfPr8n/NBCW9w+AtvQnz55SOwn5jUha6sJqS6ZXcpbSZBrkos Yex/nGDVS7ikBxD+ESjqsJ5LZqDatLHYDW/hw4+6cC6YbBCHWFinzn05go617d1kB160 IgMeqSt+C0qY/OjZ8bQHEYGKPYrXkjQgQbtby9Ss72CZYTyqvnPQYdGw8a7Tg/L+jq4u ufCDeH69QXQPeBpiz9esfIUo/O9WGb+06bRD4mkxGvGAk1c6HW3z0teXsl+h2xW44be2 SOwbd7WyJ1PpNeeDz/rfSqmURUyuRra4uOlgSM0QMqGcyx9/8GxmQm6S0wo3SnoDOy+N 3Dow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LfyssLbA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gw12-20020a0562140f0c00b00496b42cd3f4si1627773qvb.456.2022.09.14.09.44.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:44:04 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LfyssLbA; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:58954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVUY-0002jM-J6 for patch@linaro.org; Wed, 14 Sep 2022 12:44:03 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile as we do not some of the extraneous packages from the base image to build the toolchain. Signed-off-by: Alex Bennée 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/docker/dockerfiles/debian-hexagon-cross.docker index d5dc299dc1..8d219bb81d 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -2,12 +2,10 @@ # Docker Hexagon cross-compiler target # # This docker target is used for building hexagon tests. As it also -# needs to be able to build QEMU itself in CI we include it's -# build-deps. It is also a "stand-alone" image so as not to be -# triggered by re-builds on other base images given it takes a long -# time to build. +# needs to be able to build QEMU itself in CI we include its +# build-deps. # -FROM qemu/debian10 +FROM docker.io/library/debian:11-slim # Install common build utilities RUN apt update && \ @@ -15,11 +13,18 @@ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bison \ + ca-certificates \ + clang \ cmake \ flex \ + gcc \ lld \ + make \ + ninja-build \ + python3 \ rsync \ - wget + wget \ + xz-utils ENV TOOLCHAIN_INSTALL /usr/local ENV ROOTFS /usr/local @@ -32,7 +37,7 @@ ADD build-toolchain.sh /root/hexagon-toolchain/build-toolchain.sh RUN cd /root/hexagon-toolchain && ./build-toolchain.sh -FROM debian:buster-slim +FROM docker.io/library/debian:11-slim # Duplicate deb line as deb-src RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list # Install QEMU build deps for use in CI 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 From patchwork Wed Sep 14 15:59:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605765 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp863873lth; Wed, 14 Sep 2022 09:41:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR4pgA4WpCBn//Dmp4QgAd0mgRv8VfCJFqmRSEmtH9PVvy/ShlOPTVzIXM/l8i/FOOB9FSvK X-Received: by 2002:a05:620a:2115:b0:6cd:ef64:b287 with SMTP id l21-20020a05620a211500b006cdef64b287mr16939899qkl.704.1663173666705; Wed, 14 Sep 2022 09:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173666; cv=none; d=google.com; s=arc-20160816; b=opEdVE+ii+rhoht0xnVqnRbipIJzAqtrgW5UK9xwYNyTzfFhrUNCm1iVCfKceWyt25 bTcgw2/otiXsL7uSunPWbJ0jFA5ugc1BILeVGleTF+niMXM+nbaLFvTSl5oHgcz50YFa CGs02I8Hv+1XnmlzNQZGPppPCXgtN35bvLDvW/5H36UdBUDRj4NYfzSIrofxugT6dJ9T heQ8pRHbng/FzJXnSF3D63OwUNMXwHOyCs+QQ80//8tO8KIGXsKQtjXeDsEP+EREhJQw ukVoIl/TyyMZJ5lty6Od7nR3p430ho91VHfd7wqNR0tNqejX2DDf4ZGQGnb0TfDvSy4x MxCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BzWKln5PytAzOwwrEI5gVpszKbRJrpWZUaBdq/kcO8c=; b=fmNs/mOhzJLY+cnxu5+LVi6A+X1hGIKANLhr3AgREqEeKB4z4d6MV00JujI6YeIT+1 EmkLzca+G2HnN4QTTz4gmyLYr9NoScFMyIUgI7WVCzphbFEaH2Klp2TNf4l3L2rCOIsy zRihAx1ik56Urqi416yGzViypFQ7uw92KNjTDbe8KJXbDb4Je1UjmrUS+bHRF45OpnG2 dPoD1c3dAvSBs9yWlc61Os7BDi8/kkWp7dg+CVF/Pp4B+LIViGVkRnZt2lDehDoJcEhr ry/tHwMPDa/b1DuxyyhLDRkRW7NEKbzrsEIvnWvriEUewhbWZGzyfblgPZO4ITyvyidM D8Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MZctr4eV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id cm19-20020a05622a251300b0035bb82b284asi1530830qtb.568.2022.09.14.09.41.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:41:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MZctr4eV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41330 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVRi-0007hX-4s for patch@linaro.org; Wed, 14 Sep 2022 12:41:06 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Update to the latest stable Debian. While we are at it flatten into a single dockerfile as we do not need anything from the base image to build the toolchain. This is used to build both the nios and microblaze toolchains. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth 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)/debian-toolchain.docker \ $(DOCKER_FILES_DIR)/debian-nios2-cross.d/build-toolchain.sh $(call debian-toolchain, $@) -# Specialist build images, sometimes very limited tools -docker-image-debian-microblaze-cross: docker-image-debian10 -docker-image-debian-nios2-cross: docker-image-debian10 - # These images may be good enough for building tests but not for test builds DOCKER_PARTIAL_IMAGES += debian-alpha-cross DOCKER_PARTIAL_IMAGES += debian-powerpc-test-cross diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index 738d808aa6..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 # Install build utilities for building gcc and glibc. # ??? The build-dep isn't working, missing a number of @@ -15,6 +15,7 @@ RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ bison \ + ca-certificates \ flex \ gawk \ libmpc-dev \ @@ -32,5 +33,5 @@ RUN cd /root && ./build-toolchain.sh # Throw away the extra toolchain build deps, the downloaded source, # and the build trees by restoring the original debian10 image, # then copying the built toolchain from stage 0. -FROM qemu/debian10 +FROM docker.io/library/debian:bullseye-slim COPY --from=0 /usr/local /usr/local From patchwork Wed Sep 14 15:59:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605763 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp862344lth; Wed, 14 Sep 2022 09:38:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR7w0NRE+ELsr1DVTAU+v4WY4uol1nINUj+IfoCQ44vT75qE0bC2Z9+17aEdNJHgO1nxVfhM X-Received: by 2002:a05:622a:138b:b0:35b:b619:b87d with SMTP id o11-20020a05622a138b00b0035bb619b87dmr13271159qtk.146.1663173498638; Wed, 14 Sep 2022 09:38:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663173498; cv=none; d=google.com; s=arc-20160816; b=g81IR57J+zGwJgAHWq6Op2NYTuS4aoEgTXUPkvqumoGY6KXo4n7QjWdQO4I9aoLr0I JgoMcK+7vHTrl/PWsW5weaEfb4JMPiUMzmSXKrNwJASksROQy2qAFC5Ss0RtfTyznpho ZYPhZVe9CGjxQQitdU3lBKI2cquRSLeU/h6W5dt1pEnQ3QoZfP7WaNjbhU9RR/HniH6s WGP1pH6reaxr5Y5PquraKUAhOLrLBxGMhJe3i6LomqNHhSqW0YF2lYotcE0D/L3dRReE bNS2OSou6O0luB9THW83+j4ZeA02kRHSezl4dzEX+aqSWFmNJzu1o+wHvREs5xzY9fks 4aSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=iVi2M5JVgPxoYJPoTzeenSW9Sp6hbVA3bl4+rpNzI1c=; b=d1oKtpuAaO0vgry4JszxkH5jkGZNn4IWnB8rQE8cA7P/0w8//p1gApR/14Jzh7OEnU OLh1gXakU4BMpRvto8bwQ1ThGRSm/v5kOphQGO2MOcoerTZBWg/n1YS2LBjtwXLF+44J KUkP9Z4uDNXpH1QxKKgpsRbmOKwyE9KA+qjP8idYbG3RKjtzMxEzKF9ORoWJupyG8KFn EX5J/0EMguHC7vyiIgZ3Vsxl7WVOYMEtwNjjQvrTIj39bXcpldlAH4kH8HGG4orj7YEx 6DJKxiUdk0rVlvEG0b7fwji1iJLvaniSUUr9tTPcwlTKLHInFwEWdqr/G25XAnKGA55Q Fa+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mz4/OrEy"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 14-20020a056214202e00b00498faf5a412si1658273qvf.35.2022.09.14.09.38.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:38:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="mz4/OrEy"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVP0-0003LF-3M for patch@linaro.org; Wed, 14 Sep 2022 12:38:18 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We want to migrate from docker.py to building our images directly with docker/podman. Before we get there we need to make sure we don't re-introduce our layered builds so bug out if we see FROM qemu/ in a Dockerfile. Signed-off-by: Alex Bennée Acked-by: Thomas Huth 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) -def _dockerfile_preprocess(df): - out = "" +def _dockerfile_verify_flat(df): + "Verify we do not include other qemu/ layers" for l in df.splitlines(): if len(l.strip()) == 0 or l.startswith("#"): continue from_pref = "FROM qemu/" if l.startswith(from_pref): - # TODO: Alternatively we could replace this line with "FROM $ID" - # where $ID is the image's hex id obtained with - # $ docker images $IMAGE --format="{{.Id}}" - # but unfortunately that's not supported by RHEL 7. - inlining = _read_qemu_dockerfile(l[len(from_pref):]) - out += _dockerfile_preprocess(inlining) - continue - out += l + "\n" - return out + print("We no longer support multiple QEMU layers.") + print("Dockerfiles should be flat, ideally created by lcitool") + return False + return True class Docker(object): @@ -309,23 +304,10 @@ def build_image(self, tag, docker_dir, dockerfile, if argv is None: argv = [] - # pre-calculate the docker checksum before any - # substitutions we make for caching - checksum = _text_checksum(_dockerfile_preprocess(dockerfile)) + if not _dockerfile_verify_flat(dockerfile): + return -1 - if registry is not None: - sources = re.findall("FROM qemu\/(.*)", dockerfile) - # Fetch any cache layers we can, may fail - for s in sources: - pull_args = ["pull", "%s/qemu/%s" % (registry, s)] - if self._do(pull_args, quiet=quiet) != 0: - registry = None - break - # Make substitutions - if registry is not None: - dockerfile = dockerfile.replace("FROM qemu/", - "FROM %s/qemu/" % - (registry)) + checksum = _text_checksum(dockerfile) tmp_df = tempfile.NamedTemporaryFile(mode="w+t", encoding='utf-8', @@ -371,7 +353,7 @@ def image_matches_dockerfile(self, tag, dockerfile): checksum = self.get_image_dockerfile_checksum(tag) except Exception: return False - return checksum == _text_checksum(_dockerfile_preprocess(dockerfile)) + return checksum == _text_checksum(dockerfile) def run(self, cmd, keep, quiet, as_user=False): label = uuid.uuid4().hex From patchwork Wed Sep 14 15:59:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 605771 Delivered-To: patch@linaro.org Received: by 2002:ab3:1c02:0:b0:1e7:4ce8:c350 with SMTP id u2csp869727lth; Wed, 14 Sep 2022 09:52:20 -0700 (PDT) X-Google-Smtp-Source: AA6agR5058VQe9agbI9UaEJUKQqjhSKneZDZ07aWft0d3lmTNwBEWLyO0jTMT8LVIk3UQZ25hS73 X-Received: by 2002:ac8:5e46:0:b0:344:6be6:82c4 with SMTP id i6-20020ac85e46000000b003446be682c4mr34063986qtx.240.1663174340581; Wed, 14 Sep 2022 09:52:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663174340; cv=none; d=google.com; s=arc-20160816; b=S1IC0lXcmMBJN7fuYPJfANW+2MqLKq/Eq2fCnjteqvmbb/S51kMZ1ngyKSmF6S4+sQ d8gbLCmZb3zd/tSS9Pa8YBnAlmhIfNn9g9DxCqxz1N+NNOrZZSkhWBWAV6MSqG7V7HxL iL+xR+AQHujIjLVPBo3Lan0inIJ1KFsKOe5W9uQCCWnSlQuv6nBxVSaPx2mFCwMpl4Yr fX+J3MruzgMSTM5FTi3UPTaP+UGDSu6aeuDAPs2s7IenJw5IFgvtscUtBbJxqC5okO3J EngrRDq+qO1Rm8zFW1RZCDU3A4mF0PHcLKVQV4Yb4dUQV6bRR3McMQvfH0TEjnPD5Yv+ a9NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DWTMcgN+s3+EuJqXGUpffad3Z1M+TpIkfsiXcXLeD1g=; b=XubYa+sePfKGJqKqT5V58Qn3vmIchZd3Cur2mG4S3bR7/Bxfzzf4OtR4sgyyOUHGTr /VtC3FTKfGXBTG5uy3kwq3HTJsWH1XL3fDI2cklVwdj/7PnW9zVH4FgDQSM/OZgYVW4x JHM4unQha2KzRQVmaN8hxZYETyb2/lkEMapbZP8KrSnXwNdgPQcoar/4DKGzoB0P7DVw z/SC1ccFYqZ/uQkfaeIvSL7FQ2BuWahoGm/1qbc6xiliqk1suSf81zgGW3hJYYIv6/yJ 9WVUNbNrTXmES+XEdV/OLeupJygklggNmEh0lJ78bTeFfuDJrQeci9KwYHkAtnwYlrSD lUZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ph1JPh1d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id kk19-20020a056214509300b0049bb7f7041dsi1446969qvb.140.2022.09.14.09.52.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Sep 2022 09:52:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ph1JPh1d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYVca-0003HH-1p for patch@linaro.org; Wed, 14 Sep 2022 12:52:20 -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) 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-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) 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) From: =?utf-8?q?Alex_Benn=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_Benn=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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We no longer use these in any of our images. Clean-up the remaining comments and documentation that reference them and remove from the build. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth 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: .. code:: - make docker-image-debian10 NOCACHE=1 + make docker-image-debian-arm64-cross NOCACHE=1 Images ~~~~~~ diff --git a/.gitlab-ci.d/container-core.yml b/.gitlab-ci.d/container-core.yml index e8dd1f476a..08f8450fa1 100644 --- a/.gitlab-ci.d/container-core.yml +++ b/.gitlab-ci.d/container-core.yml @@ -10,8 +10,3 @@ amd64-fedora-container: extends: .container_job_template variables: NAME: fedora - -amd64-debian10-container: - extends: .container_job_template - variables: - NAME: debian10 diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index be34cbc7ba..96d2a3b58b 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -7,11 +7,6 @@ amd64-alpine-container: variables: NAME: alpine -amd64-debian11-container: - extends: .container_job_template - variables: - NAME: debian11 - amd64-debian-container: extends: .container_job_template stage: containers diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index a3174346da..270e99786e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -69,9 +69,7 @@ docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker { echo "You will need to build $(EXECUTABLE)"; exit 1;},\ "CHECK", "debian-$* exists")) -# Enforce dependencies for composite images -# we don't run tests on intermediate images (used as base by another image) -DOCKER_PARTIAL_IMAGES := debian10 debian11 +# Special case cross-compiling x86_64 on non-x86_64 systems. ifeq ($(HOST_ARCH),x86_64) DOCKER_PARTIAL_IMAGES += debian-amd64-cross else @@ -89,10 +87,6 @@ endif # The native build should never use the registry docker-image-debian-native: DOCKER_REGISTRY= -# base images should not add a local user -docker-image-debian10: NOUSER=1 -docker-image-debian11: NOUSER=1 - # alpine has no adduser docker-image-alpine: NOUSER=1 diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/dockerfiles/debian10.docker deleted file mode 100644 index 03be923066..0000000000 --- a/tests/docker/dockerfiles/debian10.docker +++ /dev/null @@ -1,38 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target is builds on Debian cross compiler targets to build distro -# with a selection of cross compilers for building test binaries. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM docker.io/library/debian:buster-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \ - DEBIAN_FRONTEND=noninteractive eatmydata \ - apt install -y --no-install-recommends \ - bc \ - build-essential \ - ca-certificates \ - ccache \ - clang \ - dbus \ - gdb-multiarch \ - gettext \ - git \ - libffi-dev \ - libncurses5-dev \ - ninja-build \ - pkg-config \ - psmisc \ - python3 \ - python3-sphinx \ - python3-sphinx-rtd-theme \ - python3-venv \ - $(apt-get -s build-dep --arch-only qemu | egrep ^Inst | fgrep '[all]' | cut -d\ -f2) diff --git a/tests/docker/dockerfiles/debian11.docker b/tests/docker/dockerfiles/debian11.docker deleted file mode 100644 index febf884f8f..0000000000 --- a/tests/docker/dockerfiles/debian11.docker +++ /dev/null @@ -1,18 +0,0 @@ -# -# Docker multiarch cross-compiler target -# -# This docker target uses the current development version of Debian as -# a base for cross compilers for building test binaries. We won't -# attempt to build QEMU on it yet given it is still in development. -# -# On its own you can't build much but the docker-foo-cross targets -# build on top of the base debian image. -# -FROM docker.io/library/debian:bullseye-slim - -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list - -# Install common build utilities -RUN apt update && \ - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata