From patchwork Tue Feb 28 19:06:30 2023 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: 657490 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3098621wrb; Tue, 28 Feb 2023 11:12:03 -0800 (PST) X-Google-Smtp-Source: AK7set+CPsbVzPS7jrwVn/MCUxymDwGunayEo2s6mf3hNwJOa7PkhkvEhatKvlrGi2CwNGiF3WT0 X-Received: by 2002:ac8:5cc1:0:b0:3bf:e034:5f5e with SMTP id s1-20020ac85cc1000000b003bfe0345f5emr6457790qta.52.1677611522867; Tue, 28 Feb 2023 11:12:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611522; cv=none; d=google.com; s=arc-20160816; b=TCN2HJRxAIw0mJuD8NB4X2SLv54gkeoz7c7d1wCK7E03m1KR0U5fOXYV0W017rHt+g Vf04eZaYirU1kjs9qldhPGWubSc1I+/nnpnlK6bqpCZPa/fW+dQ0f7ySBfSMoertpqb1 rRqzkmz8m7aaTF/XqzQvO9AxMAheUzDW8MbCIvvga7uCa8sLq0X4ZfZ7wFY2+mXiuFg2 fyNH03ItmpENaUO1ov6UtxD8jgc+VyX1N9uRNF/eQb63Qn5d778dQ1sP1vZ0NPFTMa4f O0uZfNi6jqrra0deNHQzq3N+QbFr/B9TZ9zFHae7ycF8nhDXTF78Qx1JgG2MW48pOH+J iUdg== 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=1ticoOhCA7kOKu3KKguho+amZ9lnaesdRDBsj8TDMo4=; b=xZxnPzyEX3/ZsqzMWdA2279GbEGqRv9BPKE0Nl1JfLlY6AXNPld0/NzC7JXRUVDIXS rB648uDx4e9dpHRZu4Yrl5J6Tss+1N2KzBPF0HrfT+oDPCm0VSqsl3Ihs+QNS0mxlmkp d5OI09F9kXxRS7Q2JSAOOop5OQ+aWibm1RZtKOpOCCWiOpcp8kJt77c2sHhUMPzGnsAy dHu+TKHXpwZcuqBuLEBFGw3CNBVGpNAZaSsgWP98uugcBxVsDM+9a122duTRQKG83sC/ 5W5UTvQWwtCg7aRPCqHhCDtH4QhvCV6T2xX9eDh40WZjkngZuedaEop8IC7dUCRwycL7 K9Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=F5vpebMY; 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 ez13-20020a05622a4c8d00b003bd15fb06d0si8497943qtb.659.2023.02.28.11.12.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:12:02 -0800 (PST) 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=F5vpebMY; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5Jv-0002NP-EB; Tue, 28 Feb 2023 14:07:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5JT-0002FY-ET for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:15 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JP-0002lE-Uo for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:06:59 -0500 Received: by mail-wr1-x431.google.com with SMTP id v16so8064887wrn.0 for ; Tue, 28 Feb 2023 11:06:55 -0800 (PST) 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 :message-id:reply-to; bh=1ticoOhCA7kOKu3KKguho+amZ9lnaesdRDBsj8TDMo4=; b=F5vpebMYwPCQ137qb98jewCUZCXTe2M0qMV7JCo46SzADzqzuB+1KJHOHfy3dPm6hh GyWoxqMQojhOJShZB2Q8Z4j+8M5ALN1qqIdaQeRxWmjnr8gTqoycj2dBMHEYjrNmk/mV UFbObbJMVg6nO6o4u8Wh9Tb4A7AxO7ygzhNGxgt0L3jSbA+S/vtxX8HLXN9DK8ivWiiM qXqzv0B04bjfXNX5euUObtV6HUtqRcWUKogvaOwmoPifhdvm2MDGuabgM/tKw7uW+pXI HrqhL8hp5vtfWYEChovbCZfcynrHYJvR7+0xRORq+OeKZqtj3oeZNnuBRYtdPL2mkSgJ mwbQ== 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:message-id:reply-to; bh=1ticoOhCA7kOKu3KKguho+amZ9lnaesdRDBsj8TDMo4=; b=fngUK89MYWDd8/afZiYP/kkxdoPSgtZKHJsQXCPwOcUJQGGaBg7RM4vM5zaSbn1Fbs ViIcw5FKOBUomfzMteCvy+0oQwTuuhuWfCOv3x4cbY6Tx5BMgcBH/UAzY6asXopzsi1v GZagieYma3GVVyrgldxSW5uiILeUwMw5BcBFYVnnel6ShHFThpR9Q5W7NflhFQYuScJX lcv2v/lnLycQrZKAJ6Tj80qA7xFdT/rk7mhRg7Gy0maQJsu9mfty+oQyu7TCaRbq7U9M zQBZ4RZlqv4rol+CjjmdHowu+jIkPUsyd+KfvzMah4BnC19GwoppQQkpt3vwSpETJwOJ iVUA== X-Gm-Message-State: AO0yUKW12b+4NUOyr1xAskcYJLkwkHMsUWdo2fj+paTGSlIgdoN0AJUC xqzXDpO5clqrS6jsH/GqJ2ON+g== X-Received: by 2002:a05:6000:18ce:b0:2c7:bbe:4572 with SMTP id w14-20020a05600018ce00b002c70bbe4572mr3115830wrq.39.1677611214195; Tue, 28 Feb 2023 11:06:54 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l17-20020a5d6691000000b002c54e26bca5sm10525553wru.49.2023.02.28.11.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:53 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3FBB81FFB8; Tue, 28 Feb 2023 19:06:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 01/24] tests: don't run socat tests on MacOS as well Date: Tue, 28 Feb 2023 19:06:30 +0000 Message-Id: <20230228190653.1602033-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In preparation for the next patch when we enable socat for our CI images we need to disable this part of the test for MacOS. The bug has been raised here: https://gitlab.com/qemu-project/qemu/-/issues/1495 Once that is fixed we should re-enable the test. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20230221094558.2864616-3-alex.bennee@linaro.org> --- tests/unit/test-io-channel-command.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 425e2f5594..04b75ab3b4 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -31,7 +31,7 @@ static char *socat = NULL; -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(CONFIG_DARWIN) static void test_io_channel_command_fifo(bool async) { g_autofree gchar *tmpdir = g_dir_make_tmp("qemu-test-io-channel.XXXXXX", NULL); @@ -128,7 +128,7 @@ int main(int argc, char **argv) socat = g_find_program_in_path("socat"); -#ifndef _WIN32 +#if !defined(_WIN32) && !defined(CONFIG_DARWIN) g_test_add_func("/io/channel/command/fifo/sync", test_io_channel_command_fifo_sync); g_test_add_func("/io/channel/command/fifo/async", From patchwork Tue Feb 28 19:06:31 2023 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: 657479 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097341wrb; Tue, 28 Feb 2023 11:09:24 -0800 (PST) X-Google-Smtp-Source: AK7set/mQyvj974XI8h7D/ycWjrx+Pvfl0gTaLGukP+7GE7gpwjP7EId3kEYsg5svlD9UvtPhxZo X-Received: by 2002:ac8:5851:0:b0:3bd:1a8a:800b with SMTP id h17-20020ac85851000000b003bd1a8a800bmr6918101qth.62.1677611364490; Tue, 28 Feb 2023 11:09:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611364; cv=none; d=google.com; s=arc-20160816; b=HZJNXK5icXvQxdOXsfySVLslP+Rzsm5ZYh51MAuzy575yHAirkJoIfXssYcZUfeKI+ HD2Jhydma+oNqq8ZWDhTR6WTi22dGv+ADM8uli1w2Q3Rj6N53DzC90tSdBI2bAFkx/o9 jPdFALLp7iEY3sxBNG8DyQFI5fb0seoELprTKTeQN9E34iznqgEJrOj12nA3Ar0kTonr 5TRY+gH50O7p3rNraryfFTxf+pouzCtP4mqhXX3lUXlvwCxsGH2JUZJzwEfis7Bi+Osa YfCnwAprI9fIO0KEgkXl5Aand8o6k7h+hdlR+5jWPE9d9oH4Ld9YRIDkG66Xml+LUW92 Z4QA== 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=VVYhUCjpOP2uAT3SZ5vy1u8FJHQqVehe61kdgG7Ht4k=; b=TFhCwMFrep1PU8Nmmu4ZU2YZHpi+ugPQrHC5WiWmCguc4+iSu4bvHUaJnmrJx8Ie16 cyNRCY5WfyTuAaqFZR0c/GT9wAVREi/OTL4s53VQWAgPEUDSDrFjZUg1+EKkDrtBsvB0 VG4rfKggcI46usbTM7aDhCR3eclqmG9+j7/qpp3pal7lVnsLdzs6jX7MznGKEKZr1+2n zQRmDA98wfrfD/0bLtzt5pxLbyitd4MnLtUODvQIFEcgwWh4wZn014ohwhKCSrd8bR3u QcQ1W1iC7hAJu1ed4qbC8tDzu/vr3jE8OLjAFFNtOj6ATJrDEBxkwEjunviTcg0NCpl9 JzfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rwJ80EWd; 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 bn40-20020a05620a2ae800b0073b9e5fb99esi8698248qkb.105.2023.02.28.11.09.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:24 -0800 (PST) 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=rwJ80EWd; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KE-0002YI-0T; Tue, 28 Feb 2023 14:07:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5JW-0002Fl-EZ for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:15 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JQ-0002mt-PI for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:01 -0500 Received: by mail-wm1-x334.google.com with SMTP id bg16-20020a05600c3c9000b003eb34e21bdfso6878427wmb.0 for ; Tue, 28 Feb 2023 11:06:56 -0800 (PST) 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 :message-id:reply-to; bh=VVYhUCjpOP2uAT3SZ5vy1u8FJHQqVehe61kdgG7Ht4k=; b=rwJ80EWdAmdiOS9M1JjIdrMaMKbNHRnBJMTf415GiiWqSQnxjnGWTb/QtWlLrtzCec TX6/Ma5sgDNDL8NUJMNc7DQo2owA275StExHF30FnAo/XQG21tVXVoqooMYHY9YRbpow bWUNVr8wPHcdJXxbpuDG6oEuIE0Q19CLFk3TNlgV+RVHz54EvsjHnrGYoKATRhZgtxYc ZAUDNdnraY6eY3diYSvNsH+tCZMYICOi0vXRhEfGAVCWqxtIO3+FRE3XfML3Je2G1Xp5 fBuXqXf99zLzcCOY4jNZIC9pyVKxi2eeDC4/n6b80GV3dHHpUFA1NMe3lPvEgGfYD2Z8 slSg== 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:message-id:reply-to; bh=VVYhUCjpOP2uAT3SZ5vy1u8FJHQqVehe61kdgG7Ht4k=; b=nqta5r+r8ZfS6ccAJHWN4jHiN0UihehFvd+TJgi1JXdPPrXcSGAHgEV1Yg8NiC4Q3S q2GTCEMIBnUB60F1quBvtf96Lzozbc2A6DtzRzKYjY892rCQGJIOF9uK5ePaV601dT4E HnIXpAXfN/URzYWgpM1+4Ip3PrZN3gdsQ04rXgsYhus04t88nRqv03N+jp8f/HnMlcgu nEIBUuv3cRpX+9gq6HZRUwF6ipMVoR+TLXUgVX+b0xmXBQN8KN/pHcQSl69yL3LKzrF/ TDrNvCLh3kmkkxy5r/kxIVs6hZY/U234370tED3UiFdvmMY4bJQYzHmv6HapRyZCcbxA U/Ew== X-Gm-Message-State: AO0yUKVO/O4LwGDnLNG2QgkHUJCFpffB4g8fPQV2BnvKC054ot3JTKk2 7/9buSxosu0jabxLtLCMYg+mLw== X-Received: by 2002:a05:600c:310c:b0:3eb:3e75:5d6e with SMTP id g12-20020a05600c310c00b003eb3e755d6emr3126640wmo.18.1677611215283; Tue, 28 Feb 2023 11:06:55 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id e17-20020a05600c219100b003e7f1086660sm17005637wme.15.2023.02.28.11.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:54 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 83D671FFBA; Tue, 28 Feb 2023 19:06:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 02/24] tests: add socat dependency for tests Date: Tue, 28 Feb 2023 19:06:31 +0000 Message-Id: <20230228190653.1602033-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org We only use it for test-io-channel-command at the moment. Unfortunately bringing socat into CI exposed an existing bug in the test-io-channel-command unit test so we disabled it for MacOS in the previous patch. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Cc: Marc-André Lureau Message-Id: <20230221094558.2864616-4-alex.bennee@linaro.org> --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-12.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/centos8.docker | 1 + tests/docker/dockerfiles/debian-amd64-cross.docker | 1 + tests/docker/dockerfiles/debian-amd64.docker | 1 + tests/docker/dockerfiles/debian-arm64-cross.docker | 1 + tests/docker/dockerfiles/debian-armel-cross.docker | 1 + tests/docker/dockerfiles/debian-armhf-cross.docker | 1 + tests/docker/dockerfiles/debian-mips64el-cross.docker | 1 + tests/docker/dockerfiles/debian-mipsel-cross.docker | 1 + tests/docker/dockerfiles/debian-ppc64el-cross.docker | 1 + tests/docker/dockerfiles/debian-s390x-cross.docker | 1 + tests/docker/dockerfiles/fedora-win32-cross.docker | 1 + tests/docker/dockerfiles/fedora-win64-cross.docker | 1 + tests/docker/dockerfiles/fedora.docker | 1 + tests/docker/dockerfiles/opensuse-leap.docker | 1 + tests/docker/dockerfiles/ubuntu2004.docker | 1 + tests/lcitool/projects/qemu.yml | 1 + 20 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/freebsd-12.vars index 8934e5d57f..44d8a2a511 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 bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex 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 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex 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 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract 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 65ce456c48..7622c849b2 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 bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex 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 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio spice-protocol tesseract usbredir virglrenderer vte3 zstd' +PKGS='alsa-lib bash bison bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimage cmocka ctags curl cyrus-sasl dbus diffutils dtc flex 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 pixman pkgconf png py39-numpy py39-pillow py39-pip py39-sphinx py39-sphinx_rtd_theme py39-yaml python3 rpm2cpio sdl2 sdl2_image snappy sndio socat spice-protocol tesseract usbredir virglrenderer vte3 zstd' PYPI_PKGS='' PYTHON='/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-12.vars b/.gitlab-ci.d/cirrus/macos-12.vars index 65b78fa08f..da6aa6469b 100644 --- a/.gitlab-ci.d/cirrus/macos-12.vars +++ b/.gitlab-ci.d/cirrus/macos-12.vars @@ -11,6 +11,6 @@ MAKE='/opt/homebrew/bin/gmake' NINJA='/opt/homebrew/bin/ninja' PACKAGING_COMMAND='brew' PIP3='/opt/homebrew/bin/pip3' -PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract usbredir vde vte3 zlib zstd' +PKGS='bash bc bison bzip2 capstone ccache cmocka ctags curl dbus diffutils dtc flex gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo json-c libepoxy libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb llvm lzo make meson ncurses nettle ninja pixman pkg-config python3 rpm2cpio sdl2 sdl2_image snappy socat sparse spice-protocol tesseract usbredir vde vte3 zlib zstd' PYPI_PKGS='PyYAML numpy pillow sphinx sphinx-rtd-theme' PYTHON='/opt/homebrew/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 4a569d82f6..56cf14e553 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -94,6 +94,7 @@ RUN apk update && \ sed \ snappy-dev \ sndio-dev \ + socat \ sparse \ spice-dev \ spice-protocol \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index fbc953c6dc..1291ae1b04 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -105,6 +105,7 @@ RUN dnf distro-sync -y && \ rpm \ sed \ snappy-devel \ + socat \ spice-protocol \ spice-server-devel \ systemd-devel \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 5175095a85..856db95100 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index b61f664ea2..e3dba71ad5 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -120,6 +120,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ systemtap-sdt-dev \ tar \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index b69958c69f..b00e9e9bcf 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index 96b524fab6..fb1129f256 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 08a75cebdb..7a2b864a38 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 5930e6fa5d..5a3340e964 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index c65d9830e7..422fdebe8f 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 2ae56c978e..78d7ae6211 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 0db86a0fcd..d06ea3605a 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ tar \ tesseract-ocr \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index b659c0b8a8..21ed1c6081 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \ python3-sphinx_rtd_theme \ rpm \ sed \ + socat \ sparse \ spice-protocol \ tar \ diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 0a404c15bf..95d30e7936 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -52,6 +52,7 @@ exec "$@"' > /usr/bin/nosync && \ python3-sphinx_rtd_theme \ rpm \ sed \ + socat \ sparse \ spice-protocol \ tar \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 5d60a96141..8e06d080b8 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -113,6 +113,7 @@ exec "$@"' > /usr/bin/nosync && \ rpm \ sed \ snappy-devel \ + socat \ sparse \ spice-protocol \ spice-server-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 4b2c02d6ab..568c1c979f 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -104,6 +104,7 @@ RUN zypper update -y && \ sed \ snappy-devel \ sndio-devel \ + socat \ sparse \ spice-protocol-devel \ systemd-devel \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 13ab0b6887..f34d88d33d 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -119,6 +119,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ python3-yaml \ rpm2cpio \ sed \ + socat \ sparse \ systemtap-sdt-dev \ tar \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 6467bcf08a..2854748f49 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -101,6 +101,7 @@ packages: - sed - snappy - sndio + - socat - sparse - spice-protocol - spice-server From patchwork Tue Feb 28 19:06:32 2023 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: 657478 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097295wrb; Tue, 28 Feb 2023 11:09:19 -0800 (PST) X-Google-Smtp-Source: AK7set8j1bPrpeCfzP8taL0Vg/Xsz665aqIlXHZUaqOGdL2tUbnYmgh+CuDiyQ+kjfreUs//EMm0 X-Received: by 2002:a05:622a:40d:b0:3bf:d258:c151 with SMTP id n13-20020a05622a040d00b003bfd258c151mr6740346qtx.12.1677611359547; Tue, 28 Feb 2023 11:09:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611359; cv=none; d=google.com; s=arc-20160816; b=kDInlQFdzWEIVT3Pc5f36UuKLQwMHVWnEFs48aV3R/72fBaxbgI9JUN98/U4/+aCdz /sANM70Ak7tIbLHAHWUqMvOeawBIzgtfFXklbDb0kweoH6OKf1yUqF++/dBFA7kZ1bHA Yv1h8OOFQldeCoC2sn/jRQpA2wR1I0op9m8VDBKik1NDNs0pQ+IR/5fwEVO2XVn/vUH8 4E9SQ6QONAIpbJ5rWhzdjMkHD9fUgx6kvzpex0JASM330Xg/42wq5asb3KxQymbtUCkn duBoNiM5d8LbxDF6kQ4MIkM4TvF8wE7CwjP6HnDpPbLGIHIjN5CbSddPeSc+k5iglCk2 x7Uw== 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=5wgqhpOuR7e6cKqdeQ7eDt12+eCjeJwpWxVsBAVXjj4=; b=dOqGnPCFz6G/mAe1zDXHqrJopHxtocuH/h6eXdZsHI+iUuaJ1fP3SzXF+tZLQMrzwG iBpqLDoyFCg/6ASctTNAtfbeADzZ1cPKyubP2bMHPdYf5PgR5itZd9tENX/6460y9bXK QaW1NrNA+LxCRDzDJoI5zguiCZP/NiP1gic84h1lI/ao+Qb82YlquuE2mMwEm3aYBsR7 wUBU57dtJpGbuKQBrQPLo9MFfiHlQUj26tQ1U0Lj32RTfaPVoy6VeZaeUBUojCVoELf3 qiyLM2e6/bbn4VOENFZ4/ZY+mIwm4Xeag0K5jlNEIwk9maibJUoHWzRu7ysRLhZ7M9xl HgZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ArEdwujJ; 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 18-20020a05620a049200b00742cbffa5d5si2206160qkr.375.2023.02.28.11.09.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:19 -0800 (PST) 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=ArEdwujJ; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KB-0002Uu-Ha; Tue, 28 Feb 2023 14:07:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5JT-0002Fb-HR for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:15 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JQ-0002ln-F3 for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:06:59 -0500 Received: by mail-wm1-x335.google.com with SMTP id c18so7132574wmr.3 for ; Tue, 28 Feb 2023 11:06:56 -0800 (PST) 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 :message-id:reply-to; bh=5wgqhpOuR7e6cKqdeQ7eDt12+eCjeJwpWxVsBAVXjj4=; b=ArEdwujJWnIc0xOGkrrbqFuONQZaB8cf56w6B/8UFbuHl46ijekAFfBLoHJBGYWng5 DqVEBd1S37zqhTg8mAPkFl2EJGJIcjzeRvAkz6TN4+eQssh0nzvBQhNO0ruEDTFJ4F+Q Rhhm6UXrw3kKqBqj6/K7ZQX8AOuOqCHHVFc3Nu0TX/hqW+GI5/tlEgTO+o18XoG42w3q eriicvc2VOdpaE34kLhmSeRj+5fPLXes8ouI76r+r6koNbpDMF8u8Ai2C9b6JIOHnfhN A3o9WFS+3adfqiZv84YfTWJstXrABKd1hn95YJfLGOn/7mFuqwzrMVNjQUbyj2Xe5DLe ulLg== 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:message-id:reply-to; bh=5wgqhpOuR7e6cKqdeQ7eDt12+eCjeJwpWxVsBAVXjj4=; b=pD6FofYf88NDhskCu+onIVPWuSbwdFWkYj2CwQSjNXlKsOAMMqtd/uQDK78gMMra9k ccwy3lKOu9LM+5fsegKSkcE2vJd+LbrFWQY6JFp6mwRRtd/yarukKQx0X7CM/26VPh6h 4451gwISvV0OYLq+jvboWt7MaRZkbcPqSnghfcGaezcks0oeVMMGvCLIbW7l92Y+UVfv mZLasPLmTPFUIK/BYd37PA9EqI8XtYt3XPWFtYkBHMHN9woOAxwqnC/0PU5iJJNh1PXx SoGe2EHwbCGXiD+RVS8i9UUOIO/z99qbV/B6lZ9oW23gtNt2XKG6iKHNBWSDRE33R5Qx Rt3A== X-Gm-Message-State: AO0yUKVQ6GiM0FXmcrlOKdwsJL82cF0ei/1vkAXbsjljQxLfmmD4TLOd xF+LW6hnkzUQSTZ8XHfU50ZL/Q== X-Received: by 2002:a05:600c:331c:b0:3eb:55d2:9c4c with SMTP id q28-20020a05600c331c00b003eb55d29c4cmr1562324wmp.16.1677611214972; Tue, 28 Feb 2023 11:06:54 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o19-20020a05600c379300b003e2052bad94sm16690886wmr.33.2023.02.28.11.06.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:54 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E1BC1FFBB; Tue, 28 Feb 2023 19:06:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta , Richard Henderson Subject: [PATCH v3 03/24] tests: be a bit more strict cleaning up fifos Date: Tue, 28 Feb 2023 19:06:32 +0000 Message-Id: <20230228190653.1602033-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org When we re-factored we dropped the unlink() step which turns out to be required for rmdir to do its thing. If we had been checking the return value we would have noticed so lets do that with this fix. Fixes: 68406d1085 (tests/unit: cleanups for test-io-channel-command) Signed-off-by: Alex Bennée Suggested-by: Philippe Mathieu-Daudé Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20230221094558.2864616-5-alex.bennee@linaro.org> --- tests/unit/test-io-channel-command.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/unit/test-io-channel-command.c b/tests/unit/test-io-channel-command.c index 04b75ab3b4..c6e66a8c33 100644 --- a/tests/unit/test-io-channel-command.c +++ b/tests/unit/test-io-channel-command.c @@ -42,6 +42,7 @@ static void test_io_channel_command_fifo(bool async) g_auto(GStrv) dstargv = g_strsplit(dstargs, " ", -1); QIOChannel *src, *dst; QIOChannelTest *test; + int err; if (mkfifo(fifo, 0600)) { g_error("mkfifo: %s", strerror(errno)); @@ -61,7 +62,10 @@ static void test_io_channel_command_fifo(bool async) object_unref(OBJECT(src)); object_unref(OBJECT(dst)); - g_rmdir(tmpdir); + err = g_unlink(fifo); + g_assert(err == 0); + err = g_rmdir(tmpdir); + g_assert(err == 0); } static void test_io_channel_command_fifo_async(void) From patchwork Tue Feb 28 19:06:33 2023 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: 657473 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3096586wrb; Tue, 28 Feb 2023 11:07:41 -0800 (PST) X-Google-Smtp-Source: AK7set86bA2RLW66i/D1tTTu7wDg51VFiE58Z9llZDZe/M9KJKBdhSJOFyW2YLIK8EoYefHK1HcO X-Received: by 2002:a05:6214:d6e:b0:56e:ae9f:a503 with SMTP id 14-20020a0562140d6e00b0056eae9fa503mr8417836qvs.31.1677611261085; Tue, 28 Feb 2023 11:07:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611261; cv=none; d=google.com; s=arc-20160816; b=w00OtXmgAOAOc2VNFQFHlfDFihsca7OZuoTe/MARx9aCkdb2mKxAALsSKDvNhCRdAD SEQi6vEwnw/b4izXsGmTWXPZI/NfUd33oBWWtqU1iRMuQmyvivfMezA1yCZFMuDb+vnz 735mmIJLtuS1v3Hdc5HXX6zaqRNtEuJuLr/cZAMGxwyg6YSgXnMze4RAhCKB5uTGf0X8 lIjn8GE8OE0br9Sq28B2J7nLV94GsDbpwfzrtVqf1g7IKkiqRQ+I3w8J1kXxvtHe5rrJ 9orQJG8vge/GF3ZY6+8ili4IxtkTqQn2Tw5HZkcyN7TucZnb5JqVLRooV7oD3Jw7inkV ZBPA== 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=SzNbeKwIel9LjJg1sGOYSKULJS+0zOsIf4KMX2V7u0g=; b=ETDOe1+UMDFiPXlcuq9pvEjdlD4FxLcviuAsoZgtt0qzZIhprvJBja0UoFRnvXn9zj Q8wtH1saMa+k4tzxQv45SO+9VOQPfyV6CVebqnrZKRnEpa3iAe+3GEgBwtCAKG1EgSup VBwM09rVZj3TdqhvN73jq1ZorJ2watD5BUoOdjxHlEF3+I6atvHKpX2YalTrqPa9GOZF 1frZ9ugB2Dah6Uy5lLgCyKD1VdPxqFoNXoU/GKGq0lcyCK/lmNl+7BrbfQv7eNzgicl0 M0c5C5QTJmrTg7f9KIXisjuaSI7Yz5kIkTa4JnWSK5eeOps3piozIiG4xOn1U10KCdUy LpYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ph5Nho2s; 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 n128-20020a374086000000b00728578b7527si8344190qka.528.2023.02.28.11.07.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:07:41 -0800 (PST) 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=ph5Nho2s; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5Jw-0002ON-8O; Tue, 28 Feb 2023 14:07:28 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jb-0002G7-SE for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:15 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JR-0002nD-8P for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:02 -0500 Received: by mail-wr1-x436.google.com with SMTP id g3so1995567wri.6 for ; Tue, 28 Feb 2023 11:06:56 -0800 (PST) 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 :message-id:reply-to; bh=SzNbeKwIel9LjJg1sGOYSKULJS+0zOsIf4KMX2V7u0g=; b=ph5Nho2sEe83aXr1/LNDSkwlWK4g1QTqP/Aa7o09f41oBWoOr0B4CxuPk414LLcJqG Ggq6pSJz23UBoJb9YWZoHdDT3s3OFmCnUfD9BtR5BOvtFP63ma70bp6SEV7aLX6gsOzx bmpDgWdlvAhxPCMOiFE7DZ5iB93ok2x8hO/d5vAeGMKIPKkhUFd7UP34dw2X8OpLXrHZ U7Lsh14Rd4/QPia4ryOL1YtL2sWCoiuvLZupI7mGDckdOmPlPISwAhhchN0yODD+91pi vlyoGkPiHDDK+der+P0xe6+OW4PJ+sEcCD2ZNEjs/cd4wpWEqpx2+z5qfLVkO8Ojbl5g e5FA== 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:message-id:reply-to; bh=SzNbeKwIel9LjJg1sGOYSKULJS+0zOsIf4KMX2V7u0g=; b=2GLYz9U2Q6Y3LRfKD3YP13OrPlUSc5jT5xmFc+pH2Gwi7JDT005cGGyVBFLdL07vnY zoESkp96ZjQVvZbVC1yyBdNUyJixpIZWrwsLSvpTr6cnt47UVa8MMbaHlauIvWPHCmzs BXx7DaV2jqrcWEwvw0WunlX718tYpAUUbAuO6fFxErzQsfJ+9juLGumkJq7jhgL2n+by 4+BmW/HOE//38zAFuxst3TX/bjHiBHxAXtz0HpzhWwxygJFvnqywEIQTEVC4165Rn25y TORoI6nIO7IZk4YDqzQZPYUkDOQUWNb8tCVdN3z15+/FlL0czsTHVdQOzwH/n95Aa1c9 BXbA== X-Gm-Message-State: AO0yUKXCuXdrDevW0FtJuFJA2KWsbGJqwVQnS1/12rBXBBGTSs5FYzkK a+acKAVCiVZbIKKtEJXzzWYQQg== X-Received: by 2002:adf:ce10:0:b0:2c7:e05:2d1b with SMTP id p16-20020adfce10000000b002c70e052d1bmr3155429wrn.50.1677611215768; Tue, 28 Feb 2023 11:06:55 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m15-20020a5d6a0f000000b002c707785da4sm10345454wru.107.2023.02.28.11.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:54 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BB21A1FFBC; Tue, 28 Feb 2023 19:06:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 04/24] tests: make fp-test less chatty when running from test suite Date: Tue, 28 Feb 2023 19:06:33 +0000 Message-Id: <20230228190653.1602033-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org As we like to run tests under CI with V=1 flags the softfloat tests can add up to a fair amount of extra log lines. With an update to the testfloat library we can now call fp-test with the -q flag and reduce the output to a terse one line per function tested. make check-softfloat V=1 | wc -l 759 Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-6-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- tests/fp/fp-test.c | 19 ++++++++++++++----- tests/fp/berkeley-testfloat-3 | 2 +- tests/fp/meson.build | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/fp/fp-test.c b/tests/fp/fp-test.c index 35829ad5f7..36b5712cda 100644 --- a/tests/fp/fp-test.c +++ b/tests/fp/fp-test.c @@ -106,7 +106,8 @@ static const char commands_string[] = " -l = thoroughness level (1 (default), 2)\n" " -r = rounding mode (even (default), zero, down, up, tieaway, odd)\n" " Set to 'all' to test all rounding modes, if applicable\n" - " -s = stop when a test fails"; + " -s = stop when a test fails\n" + " -q = minimise noise when testing, just show each function being tested"; static void usage_complete(int argc, char *argv[]) { @@ -190,9 +191,11 @@ static void do_testfloat(int op, int rmode, bool exact) ab_f128M_z_bool true_ab_f128M_z_bool; ab_f128M_z_bool subj_ab_f128M_z_bool; - fputs(">> Testing ", stderr); - verCases_writeFunctionName(stderr); - fputs("\n", stderr); + if (verCases_verbosity) { + fputs(">> Testing ", stderr); + verCases_writeFunctionName(stderr); + fputs("\n", stderr); + } if (!is_allowed(op, rmode)) { not_implemented(); @@ -837,7 +840,7 @@ static void parse_args(int argc, char *argv[]) int c; for (;;) { - c = getopt(argc, argv, "he:f:l:r:s"); + c = getopt(argc, argv, "he:f:l:r:sq"); if (c < 0) { break; } @@ -874,9 +877,15 @@ static void parse_args(int argc, char *argv[]) } } break; + /* + * The following flags are declared in testfloat/source/verCases_common.c + */ case 's': verCases_errorStop = true; break; + case 'q': + verCases_verbosity = 0; + break; case '?': /* invalid option or missing argument; getopt prints error info */ exit(EXIT_FAILURE); diff --git a/tests/fp/berkeley-testfloat-3 b/tests/fp/berkeley-testfloat-3 index 5a59dcec19..40619cbb3b 160000 --- a/tests/fp/berkeley-testfloat-3 +++ b/tests/fp/berkeley-testfloat-3 @@ -1 +1 @@ -Subproject commit 5a59dcec19327396a011a17fd924aed4fec416b3 +Subproject commit 40619cbb3bf32872df8c53cc457039229428a263 diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 312a4d301f..f9ca6a93b4 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -609,7 +609,7 @@ softfloat_tests = { # The full test suite can take a bit of time, default to a quick run # "-l 2 -r all" can take more than a day for some operations and is best # run manually -fptest_args = ['-s', '-l', '1'] +fptest_args = ['-q', '-s', '-l', '1'] fptest_rounding_args = ['-r', 'all'] # Conversion Routines: From patchwork Tue Feb 28 19:06:34 2023 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: 657487 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3098161wrb; Tue, 28 Feb 2023 11:11:04 -0800 (PST) X-Google-Smtp-Source: AK7set/gl+oUyLiA5jVPZKcEg7EAl3rBuaTaIFsMjbx1g3IanZmH9h6p+R+HwJdlcqmwnezapJ4s X-Received: by 2002:ad4:4eac:0:b0:572:636d:625f with SMTP id ed12-20020ad44eac000000b00572636d625fmr7794917qvb.33.1677611464530; Tue, 28 Feb 2023 11:11:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611464; cv=none; d=google.com; s=arc-20160816; b=PBKr9Sm+EkWnGQqBIIxIIDIC8cXj372vzx5iXNUn46mHFTdboKGpttLuz2mYrv9dPO ziORZqO3XMLRihaUTy9YRgAbXMi4QU6Ueu9nwD2OmXgPsO4kiAy1pGcomPKQO59o4o12 DzgfvP5yPCvf55FMwZSlAcHR7v6UeHdQNwRoC+FtyTULliZkv16WawLAvyKOF2uFrvYr sM3n2VINYXZNOaBSUKdfJkHwQ91lB3YeeCsFKE7CSr7bpetiQgpHL16r4mAgze6vAjnB 6DOY9Ff3xoyNJVyvB6aMFqFl/EE4BpapYj7fr05Ti0pT4D0oWk4uOhSpmZtQIOYVHjS3 iy+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=T0snCxknU51VUiIyOYYXzqb7lXY8Z5Vkr/7qnzRTdnE=; b=O0gHaEsDW17+G6ECq605EQ+uSy7QQ+ChBNPSCmVxjfv4DmZVdjiff2OpbXD+vhEZe4 9d0zxPp2vO2REBMYZNrAOqJJ4uQYYkl1CypuWHgy9cOWQtep6G5M3KRLKzrx7Emhp5gH siKP3pBdyEcPHhWvLesZGgilnkQ6n5P/+BDpHTziUprXXQb0b9/39wheX24ZVBYwBDOL M06YHy2wnD4YoPPxnz7I2/8BGYZqZ7gT1UqeOAa2fyxyHSojIWc9Xu1yWSVQMmDDmwfS xyiumV5qR+W8BcTWKPcoVZZnNiJ2qyInMgpz/Nyc3ckq8P/wG7hff8i4p0tI7DSrJ2gI DLJw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jxXSJywn; 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 o19-20020a0ccb13000000b0056f0a55b3b2si8877268qvk.90.2023.02.28.11.11.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:11:04 -0800 (PST) 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=jxXSJywn; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KA-0002Td-Md; Tue, 28 Feb 2023 14:07:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jb-0002G8-T1 for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:15 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JS-0002o5-9l for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:03 -0500 Received: by mail-wm1-x329.google.com with SMTP id l7-20020a05600c4f0700b003e79fa98ce1so6514589wmq.2 for ; Tue, 28 Feb 2023 11:06:57 -0800 (PST) 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 :message-id:reply-to; bh=T0snCxknU51VUiIyOYYXzqb7lXY8Z5Vkr/7qnzRTdnE=; b=jxXSJywnNu0PLak5jn92nBPa5UJuUl5rRmwSrHfecXKSJwwFeXOo34e46hs2exhJr4 uig/+YUIfQkOfetcsfwn8k2rJB91hgp+1EPDFy2hPvq8nVVla/zQ6ZI3/yQwz80Tunte YKL/Ru9VM+iPlWc9zQO4nGaBX28uizr+noVM96+o/3c9n1trUqn0udW5wpncxtsQlsIn 5FF8LSRMHt1/1q9RK0D3GGgNXISyPR0DMR34zLwwjWnB3VPQ/GDV1OaKtAguQKO5ukyI ev3zpbR8+XoB06E4QCuqAZTd09Zl7koxiZEYlxX4hKrnaBJQEFX+TnhOiuk4Hf/3caca FuxA== 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:message-id:reply-to; bh=T0snCxknU51VUiIyOYYXzqb7lXY8Z5Vkr/7qnzRTdnE=; b=5D2j9kuLunt2rqBogv11z4TU7gAaTBjrPbuP75ClJqwVQjJGx/fQ82ZTNyfdFueMyu G4TeTSAG2Y2TFItRWmzlZAgadJcvp+nkiBo4jE68C7TcjbAcoJaud7oBP+6/DHiY+TaM 7tfXTlsdnohpN1ttQW4HDbIdWDoVk6nMD2JbrxjIqQQuyQdnApwQYpwkPcVW/xF4m2y8 9WeVeq7gBbEH3emFbPVSIEMb6tWHTx9+6BFggfgZUJ/pQfL05l3k3ewjaiVEA9R7ecmK gENZwXYdNLe4/you65bCNhgDnCmJ7HiQ+2C+GU5r+hPmp/szxivAQvh/Yh3UNWJuLCdB FCBw== X-Gm-Message-State: AO0yUKUoY8M1WxSqcR8B9ndDTeJB9m01nwNrd3J8vgCLuJJH4iY4bPgm EGcXy2XEPNqmIjjdrRvjzHWe4w== X-Received: by 2002:a05:600c:3506:b0:3ea:d620:579b with SMTP id h6-20020a05600c350600b003ead620579bmr3066036wmq.0.1677611216721; Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id bi22-20020a05600c3d9600b003dc42d48defsm13548583wmb.6.2023.02.28.11.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:55 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D455A1FFBD; Tue, 28 Feb 2023 19:06:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 05/24] gitlab-ci: Use artifacts instead of dumping logs in the Cirrus-CI jobs Date: Tue, 28 Feb 2023 19:06:34 +0000 Message-Id: <20230228190653.1602033-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth The meson log files can get very big, especially if running the tests in verbose mode. So dumping those logs to the console was a bad idea, since gitlab truncates the output if it is getting too big. Let's publish the logs as artifacts instead. This has the disadvantage that you have to look up the logs on cirrus-ci.com now instead, but that's still better than not having the important part of the log at all since it got truncated. Fixes: 998f334722 ("gitlab: show testlog.txt contents ...") Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé Message-Id: <20230215142503.90660-1-thuth@redhat.com> Signed-off-by: Alex Bennée Message-Id: <20230221094558.2864616-7-alex.bennee@linaro.org> --- .gitlab-ci.d/cirrus/build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.d/cirrus/build.yml b/.gitlab-ci.d/cirrus/build.yml index 7ef6af8d33..a9444902ec 100644 --- a/.gitlab-ci.d/cirrus/build.yml +++ b/.gitlab-ci.d/cirrus/build.yml @@ -32,6 +32,9 @@ build_task: - $MAKE -j$(sysctl -n hw.ncpu) - for TARGET in $TEST_TARGETS ; do - $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1 - || { cat meson-logs/testlog.txt; exit 1; } ; + $MAKE -j$(sysctl -n hw.ncpu) $TARGET V=1 ; done + always: + build_result_artifacts: + path: build/meson-logs/*log.txt + type: text/plain From patchwork Tue Feb 28 19:06:35 2023 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: 657480 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097426wrb; Tue, 28 Feb 2023 11:09:33 -0800 (PST) X-Google-Smtp-Source: AK7set8Uh1QvVBQT74uZtFOOTLi5v6x267uP6mUOXUSHkU72wYFGvDnVd/Q4cm2pcuDUbXDnfgdo X-Received: by 2002:a05:6214:2388:b0:56e:a899:1614 with SMTP id fw8-20020a056214238800b0056ea8991614mr7227622qvb.0.1677611373375; Tue, 28 Feb 2023 11:09:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611373; cv=none; d=google.com; s=arc-20160816; b=GwkrjfmumE5BInNMjOX2L2d36uIB1WJlZnp319cvte9PWcSa6y4tL4C6GT7MOREpIa WG845Rd/n24JTF1l7Os9u3FMBe84Em56OUjMaSGHyP88zS7OrzsvDywtZOz1EGpclnhq uZl5J8t+9+fH84006ld7APpYwo/AS3Oc/T4IQzK+L3I6lFPqZ6uMgCyRVHjOcrwKNdI0 tgs9ImbEUT/jTr1j64gb7sXLUbFkLGurtCTPs5wiUr4fST5UO0qrNLig3dfkf3xPXd2e ud525junCcpaoRBJYgmZct+pihg01fC2EMuiOEeRUs1FQOshd8TCcs5YeOfhLikzhD94 6njQ== 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=21sp0hozNqE2G/F3Ib4OoUY82nDzhwO791FLVQWUI0Y=; b=NNWF+xf/U+1Zz8dhSBvsJh5nQq3FXn9wSohpgm02orcGH1EEWryIGwbXnCkM4CbMfw MDhjYvd+rcrQaGcJH4C2XPavrCdD5Jv4yZv1sbOewH6nKh7mXc8SD7zt0cJQIkhzTD/J 21MON0exGrJe5L30+l4LhBBg4uBeldOjR1T57Gq06yCFGHPTsdkYbmhxzpYUW/mqTRLt dQy87Noi+p+VfLck5vdz27ZecvdQg3hwbnTtNdj0w2BovLqAo0llfc5dNmeZvFkzH/WZ 2Kr7X0GQZLJ53LI6/qVcMB+2QV61SboM+4d9NJOWS31wXTd/mj7dsMZqggDyhKCnEoOJ 5nZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=k0u127K+; 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 u4-20020a05620a430400b00742d6543ffdsi1711394qko.634.2023.02.28.11.09.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:33 -0800 (PST) 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=k0u127K+; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5K3-0002Og-0D; Tue, 28 Feb 2023 14:07:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jk-0002JH-7i for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:18 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JT-0002ow-MV for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:06 -0500 Received: by mail-wr1-x42c.google.com with SMTP id bx12so7715393wrb.11 for ; Tue, 28 Feb 2023 11:06:59 -0800 (PST) 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 :message-id:reply-to; bh=21sp0hozNqE2G/F3Ib4OoUY82nDzhwO791FLVQWUI0Y=; b=k0u127K+0kfvMcv73QHpP9aIAxOwH/hP0h24oesYReBViSbaPYs7QW18rDhuF8opi0 GqQdh68zX82Mz85ZIMLVj03F9/6VkR1sYV+YTOFrNhXUd4LmySZUhDgG7M57q6ufxE69 53zlTcH+aVSGgKCV00wzy5f6M5rvt5HBzJ/HnJIpqCbRTbuE3YI7KVj/T5mykmSQNJgY MW/t+oBDM+e2oXcKqhZYJOR9q4VoABi8A9XOTc8cyCOeHyf2uX/VfYFToepjjIm6thQ0 6R8r7zQfGWfkYeGBaWgf2tTJXIMuEJN6Oc94bOQoChgKUahY08GMGlFdxM7LkxZlI+qy BXNw== 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:message-id:reply-to; bh=21sp0hozNqE2G/F3Ib4OoUY82nDzhwO791FLVQWUI0Y=; b=yX8sPvKdskta/TX4ZfiB6ZYIIhUFg9DN5kxQDPe4J2VE6+naoMzYd6W7cTDb2mdGDz ONp8lNaHquiY0QK41iKuLpNAJ69sR2iVIB/rgmVYXmOnJG/MK/gFIZATcpzBoJrhLckv vIFCFCGOa8M6YO4mudYoSGuAyskHbnHJwm1f2zCAia/Ns/VfiN81UiDk7Dr1aYNqu/7G PjrEd/E1fjMVINUvkdAPNn6oCyM0vlCMIupMe/0nrUp2thQkmdgy24nHsRsqbyW/afsT eLS12rxnQvEfyqcOQ5a6gXcRp/6wcEj/HpSgI8vKWFGbtOOl/MrGRYiMCstLkBqiq1NB Z5sg== X-Gm-Message-State: AO0yUKWWgKQHI9UFMZ4sQV7obM0DKIJJQF6QHw5vbFcyRdv+AhHrZPwe DORV0/Hu/pX+XkVxDddMGyO0Pw== X-Received: by 2002:a05:6000:38d:b0:2c5:5ee9:6b27 with SMTP id u13-20020a056000038d00b002c55ee96b27mr2816577wrf.13.1677611218055; Tue, 28 Feb 2023 11:06:58 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id s2-20020adff802000000b002c706c754fesm10613655wrp.32.2023.02.28.11.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F34561FFBE; Tue, 28 Feb 2023 19:06:53 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 06/24] gitlab: extend custom runners with base_job_template Date: Tue, 28 Feb 2023 19:06:35 +0000 Message-Id: <20230228190653.1602033-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org The base job template is responsible for controlling how we kick off testing on our various branches. Rename and extend the custom_runner_template so we can take advantage of all that control. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-8-alex.bennee@linaro.org> --- .gitlab-ci.d/custom-runners.yml | 3 ++- .gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml | 10 +++++----- .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml | 2 +- .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml | 10 +++++----- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml index 9fdc476c48..34a1e6f327 100644 --- a/.gitlab-ci.d/custom-runners.yml +++ b/.gitlab-ci.d/custom-runners.yml @@ -15,7 +15,8 @@ variables: # All custom runners can extend this template to upload the testlog # data as an artifact and also feed the junit report -.custom_artifacts_template: +.custom_runner_template: + extends: .base_job_template artifacts: name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" expire_in: 7 days diff --git a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml index f512eaeaa3..cdae6c5212 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-20.04-s390x.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04/20.04" ubuntu-20.04-s390x-all-linux-static: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -24,7 +24,7 @@ ubuntu-20.04-s390x-all-linux-static: - make --output-sync -j`nproc` check ubuntu-20.04-s390x-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -43,7 +43,7 @@ ubuntu-20.04-s390x-all: - make --output-sync -j`nproc` check ubuntu-20.04-s390x-alldbg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -66,7 +66,7 @@ ubuntu-20.04-s390x-alldbg: - make --output-sync -j`nproc` check ubuntu-20.04-s390x-clang: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -108,7 +108,7 @@ ubuntu-20.04-s390x-tci: - make --output-sync -j`nproc` ubuntu-20.04-s390x-notcg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml index 42137aaf2a..50e5646a44 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch32-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml index 8ba85be440..13e14a0f87 100644 --- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml +++ b/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml @@ -3,7 +3,7 @@ # "Install basic packages to build QEMU on Ubuntu 20.04" ubuntu-22.04-aarch64-all-linux-static: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -24,7 +24,7 @@ ubuntu-22.04-aarch64-all-linux-static: - make --output-sync -j`nproc --ignore=40` check ubuntu-22.04-aarch64-all: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -46,7 +46,7 @@ ubuntu-22.04-aarch64-all: - make --output-sync -j`nproc --ignore=40` check ubuntu-22.04-aarch64-alldbg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -65,7 +65,7 @@ ubuntu-22.04-aarch64-alldbg: - make --output-sync -j`nproc --ignore=40` check ubuntu-22.04-aarch64-clang: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: @@ -107,7 +107,7 @@ ubuntu-22.04-aarch64-tci: - make --output-sync -j`nproc --ignore=40` ubuntu-22.04-aarch64-notcg: - extends: .custom_artifacts_template + extends: .custom_runner_template needs: [] stage: build tags: From patchwork Tue Feb 28 19:06:36 2023 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: 657481 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097536wrb; Tue, 28 Feb 2023 11:09:49 -0800 (PST) X-Google-Smtp-Source: AK7set+H2GPsg9WYMARvlblMoVDqURhF83cuKhYG0zGuiGmUillkhvubXNxbo7E1kZSeyGyDEbau X-Received: by 2002:ad4:5e8c:0:b0:572:80ea:5fc7 with SMTP id jl12-20020ad45e8c000000b0057280ea5fc7mr7983665qvb.41.1677611388927; Tue, 28 Feb 2023 11:09:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611388; cv=none; d=google.com; s=arc-20160816; b=XhLq1SGmmowxt3b8F3CVXpdhpQFT2yqpxCsRpT+wsQa0OZEHvcBiMyYi/q77eduNgf KBsXhKrpiS80oZgdGbRVFd+E2CqdrMxZ1OYKkZ5QlzZaJ8pZCZR4LUtsdqzR1I91uoYi 0Z4bsSDQmjw9K7I033J7c68r295rnjCtfK11b8/vby35PSiw3cbQXVzMWXhVaoU+mLr2 ME/bSeD1aD13BiaJB094Fv1tNIpDRg8/7U9Cpi6Xnqhcf9OU6G4Z6hqQRQnd62v+WKhB Uq72hUNeFBtuN+HplAxajQvznJL04d100ILDz+Nv4XVomUfLdBzO4QWPzQtDq29m/qaH 4ZGQ== 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=5n0PF6Nzsb2L9pU8FStkO5ltsqIAi0CEb9WzAVfdpXI=; b=woPhKpFUebj1IlklNs7Hr5iteDkIu2EAv0CuyNIIIxdQ+wGC7yFFXbJHxU66zyZaQv v0/OA/OE8wMUwrGcEsgF2NthGVjRJKdgQ4lfJdpurOSVcIM1yyaTIxJy5462a6IccJXD s7nhycl9e3ca8bqBQc3uRfHyRnNrBfuP7X3Vv+uiZF5TufWjSWtHfVrmDxoTyXt7+N4c KlSoDQmkquf9DVjrGslb3XfrkxbGdDeTqZgym6OZzJYKzSCuBSYZM1FTGKc92CaeEK7w saH8qyjxW71+/bVQ0l2Z4zYIxpoSYC7TOzMCR4+UaQwP52FYD0qWJz1s0pngjzV74lZI sSaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CCIJyPOO; 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 x20-20020a05620a449400b006fca63f5c9bsi9978831qkp.108.2023.02.28.11.09.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:48 -0800 (PST) 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=CCIJyPOO; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KC-0002VC-AO; Tue, 28 Feb 2023 14:07:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jb-0002G9-TL for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:15 -0500 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JT-0002oG-1O for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:04 -0500 Received: by mail-wr1-x434.google.com with SMTP id e37so8391554wri.10 for ; Tue, 28 Feb 2023 11:06:57 -0800 (PST) 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 :message-id:reply-to; bh=5n0PF6Nzsb2L9pU8FStkO5ltsqIAi0CEb9WzAVfdpXI=; b=CCIJyPOOhP9hZGwLu64d8XAy1iaQ4UyYxp0KUclv2PLJP9MtjlT/3qtZ+2LV2BM5Gf Wwyo4jKXPXIQ9F3tUaSrbQNQJrmXlkpdFOQJ2ZlsIAmPn1zdb/hBnH7zFKi75+VvD4Ux poxDrQ3+fwJK+rO2KPE02GHURQ3k1t2cqKYQu7N6z8amIVlYQyu03kiRlx6+3OqVD6iJ o0h7s/qjowDJv5N3Yr29z1MXTT6bLWderRShRCIliaoJ/mQLM05nQFJlUf7EM5/XyN/q uWP6nQ1ycOYH8RcVIIry9FbrsLPy1Q3IJ/mfM/8lzW481HbmsUbq6Kul5z03IRy/C0vj xnaw== 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:message-id:reply-to; bh=5n0PF6Nzsb2L9pU8FStkO5ltsqIAi0CEb9WzAVfdpXI=; b=l9brPZVl20Bqpl41YsFyF6URbKf6TR2oRzvtie7iAeEVHza20famnPMwyRlfWZTApO bVm1Z1gKO/dd5SrOccw/bmWCEu84yQwPPWkoBSWAQKA2uZEq8LtVuLu3b3pk+SHJH1dN M0VmZsVk8e+1gsdtmnrv4r3jttTtM+RUkqeskVcyX/f2elEqS3hKt9F7QnTtBEicmV2a eJu7tFyBuHJX4O2ium848kpHgsiZ3ENy3Rg+FeFTW+MaaVqAnmfiSQutDbwjRM6hrOKV DJceFZbA7wvH09A1K/Nle71ehWm+3ifLat9IHMk+wqfq40J8USxCY945uSooypRBVfdL O1pw== X-Gm-Message-State: AO0yUKVOW3qbGcQ1n4LnVQKMHaNM0YaiYbuA7bwkkEFwlwQ3CcBy8grz 7mDxTJg0w9J9bCHmnd/v52RLzw== X-Received: by 2002:a5d:50c4:0:b0:2c7:b51:65d6 with SMTP id f4-20020a5d50c4000000b002c70b5165d6mr2653070wrt.27.1677611217011; Tue, 28 Feb 2023 11:06:57 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z10-20020a5d44ca000000b002c6e8af1037sm10606277wrr.104.2023.02.28.11.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1801D1FFB7; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 07/24] tests: don't run benchmarks for the tsan build Date: Tue, 28 Feb 2023 19:06:36 +0000 Message-Id: <20230228190653.1602033-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org All we are really doing here is checking that TSAN builds compile and are therefor a tool available to developers. The benchmarks are not representative of QEMU's actual threading behaviour and they burn precious CI time. Indeed switching to check-unit reveals many unaddressed issues which have been logged at: https://gitlab.com/qemu-project/qemu/-/issues/1496 So for now disable the make check and make this a build only test. Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-9-alex.bennee@linaro.org> Reviewed-by: Richard Henderson --- .gitlab-ci.d/buildtest.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index d903c42798..7b92767689 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -463,7 +463,6 @@ tsan-build: CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 --enable-trace-backends=ust --disable-slirp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user - MAKE_CHECK_ARGS: bench V=1 # gcov is a GCC features gcov: From patchwork Tue Feb 28 19:06:37 2023 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: 657489 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3098282wrb; Tue, 28 Feb 2023 11:11:21 -0800 (PST) X-Google-Smtp-Source: AK7set8olgeZISWa3TKvVfK9VMrP9iIBlW7jYbhEDyV84IijWxEQ/LFt8SH6TkNICyRaS8PG3wR2 X-Received: by 2002:ac8:5c86:0:b0:3bd:1a8a:8015 with SMTP id r6-20020ac85c86000000b003bd1a8a8015mr7133709qta.16.1677611480876; Tue, 28 Feb 2023 11:11:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611480; cv=none; d=google.com; s=arc-20160816; b=dVT/6ha3hdlPihfDBGMjQ/7wkXRrcEccZyBQHijYo5WqpbuM1V31OejtZMsU2wWKH8 27jemd7ZGAMwEJMD8xUfuRoHJorCo/+TZDOGHUGSycJFYsQ/MyTc1sioxYF7vwMvsprr 1hli1MbwhULIek/tEyMOzAVIx9Cogdm200BA6ISeVm6ayrBuOZNo4xisg69tn0i9acDv j9KZF5Xscn2yWFZZk0d+EaK7rfwSO/AyBzeU7Kdf9Cju7wl6M9e/jiRD6nnkIVf8jpyC /5aAEqDoCwWY25XHbbfJaLNZFeDtBo0rCbteTI5Z/qHXpYcLNnbdUrnYI495rziKyVNc XVCg== 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=kgpiyoiDnwYrQTKVCYiVzF8Lw6o6o1RMnLYNYIVbOdo=; b=YkLCEJN97QeGCuADPYWw6qtyffE37elHYoLc1jP0H7xLL0N/YuNu+weIQISv5ibz36 DErkz8JuOYkuGt7eYNS1UKkpe8IR1u+2jnOZQ/BDmZZWjcgVp110bxDjewvZIUjd68h0 PHAV5zjIEAUFP2+mwZufLrODjVezQEokoLNqh0AExYaGhCDGfkVZwPbhyvVbdbRTWSUS 43U0qQBvJSVIU1xQSMIlHyPr4fezif97HBELsBuD+Kds8GvklPLeIJue46meHUsE5jx+ 8ybzYB3G66jC5vhEGV3RYHgPdBq/z58+aZXTsPMdCi08fbOrEk2ozmnCa5EobO/fkW7m Re0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=L8O4qAod; 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 b2-20020ac87fc2000000b003b9b25060bbsi9694309qtk.217.2023.02.28.11.11.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:11:20 -0800 (PST) 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=L8O4qAod; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5K8-0002Q1-KN; Tue, 28 Feb 2023 14:07:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jh-0002GS-Qw for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:15 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JT-0002on-8Y for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:05 -0500 Received: by mail-wr1-x429.google.com with SMTP id bv17so10875354wrb.5 for ; Tue, 28 Feb 2023 11:06:58 -0800 (PST) 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 :message-id:reply-to; bh=kgpiyoiDnwYrQTKVCYiVzF8Lw6o6o1RMnLYNYIVbOdo=; b=L8O4qAodJWW2ALBRwums7l1EiF40LMicMk3fVml0WVhh2v+ATIjs+nGyS1y4S+n1xc aYmHsgwZWQLRHwu39qu4cUaU2+zpeCH54pDK7yS8ynbGH+Oxd8bDeXjcRmk07vBXtHhT BlTAx2tlmNneFN3T/uT2GFKqzR3TYZlObnJ4XUep1Fde7WaSgPTWV1hrxnBKqySc1BVM jkSXGHcIr+Wb6TDFjWDb2TLSaNpdBMEZUsLRsUs9UmZMabwN2JHS7wcT6vlQS/ibOc/B Y31a/67tKVR0BwJ616Toyv/aLQ+FstV1XiG5GuCfSy98LGELrxoMFiB67/wlnYTaSubG 1g4Q== 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:message-id:reply-to; bh=kgpiyoiDnwYrQTKVCYiVzF8Lw6o6o1RMnLYNYIVbOdo=; b=tV1clB4On++vW7Djwv7Tn31SXLWNxd9WfLzA75cffKB3+nfZYbXaMB73QS2cT+wwwC tfR6sMkI9BJ7wCOMqLOKSlpJRktHHo07aoBmoVADTLTonOKivdgq5sWT0PGHlP+Tfgp+ vCKaJhsXbnLXkcEDdBd0r027SLIlITcFeq3b5pXuC0HmOMBfDc7K4NpCWKOgQcf0mNvC A35eYAqN+Gg4zfS1YWeCWkdjkdj0Vl6nIZUR6DpPpMy25jGrHVsioQobjJz1HxCgIsfC pTGRcexgVewmIDueb+1TRmaSS9/ZYbSFJBEfiZYInKyXTkTDcNbp7Zt7UZdWp2rioR+V qADA== X-Gm-Message-State: AO0yUKVgl/y8FW8l5mnyga58kth6O61VRGwoOivGdQ6amvKSKUtuYRhz slTekJY6oJSKsL4qIypQOMUueA== X-Received: by 2002:adf:f48b:0:b0:2c7:1dae:ad78 with SMTP id l11-20020adff48b000000b002c71daead78mr2583305wro.64.1677611217747; Tue, 28 Feb 2023 11:06:57 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id b10-20020adfee8a000000b002c54c8e70b1sm11052279wro.9.2023.02.28.11.06.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 403E91FFB8; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 08/24] testing: update ubuntu2004 to ubuntu2204 Date: Tue, 28 Feb 2023 19:06:37 +0000 Message-Id: <20230228190653.1602033-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org The 22.04 LTS release has been out for almost a year now so its time to update all the remaining images to the current LTS. We can also drop some hacks we need for older clang TSAN support. We will keep the ubuntu2004 container around for those who wish to test builds on the currently still supported baseline. Signed-off-by: Alex Bennée Reviewed-by: John Snow Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-10-alex.bennee@linaro.org> --- docs/devel/testing.rst | 4 +- .gitlab-ci.d/buildtest.yml | 18 +-- .gitlab-ci.d/containers.yml | 4 +- tests/docker/dockerfiles/ubuntu2004.docker | 3 - tests/docker/dockerfiles/ubuntu2204.docker | 147 +++++++++++++++++++++ tests/docker/test-tsan | 2 +- tests/lcitool/refresh | 11 +- 7 files changed, 163 insertions(+), 26 deletions(-) create mode 100644 tests/docker/dockerfiles/ubuntu2204.docker diff --git a/docs/devel/testing.rst b/docs/devel/testing.rst index e10c47b5a7..309a575abe 100644 --- a/docs/devel/testing.rst +++ b/docs/devel/testing.rst @@ -574,13 +574,13 @@ https://github.com/google/sanitizers/wiki/ThreadSanitizerCppManual Thread Sanitizer in Docker ~~~~~~~~~~~~~~~~~~~~~~~~~~ -TSan is currently supported in the ubuntu2004 docker. +TSan is currently supported in the ubuntu2204 docker. The test-tsan test will build using TSan and then run make check. .. code:: - make docker-test-tsan@ubuntu2004 + make docker-test-tsan@ubuntu2204 TSan warnings under docker are placed in files located at build/tsan/. diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 7b92767689..43f9e4a81d 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -38,9 +38,9 @@ avocado-system-alpine: build-system-ubuntu: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 CONFIGURE_ARGS: --enable-docs TARGETS: alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu @@ -56,7 +56,7 @@ check-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 MAKE_CHECK_ARGS: check avocado-system-ubuntu: @@ -65,7 +65,7 @@ avocado-system-ubuntu: - job: build-system-ubuntu artifacts: true variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 MAKE_CHECK_ARGS: check-avocado build-system-debian: @@ -457,10 +457,10 @@ avocado-cfi-x86_64: tsan-build: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container variables: - IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-tsan --cc=clang-10 --cxx=clang++-10 + IMAGE: ubuntu2204 + CONFIGURE_ARGS: --enable-tsan --cc=clang --cxx=clang++ --enable-trace-backends=ust --disable-slirp TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user @@ -468,10 +468,10 @@ tsan-build: gcov: extends: .native_build_job_template needs: - job: amd64-ubuntu2004-container + job: amd64-ubuntu2204-container timeout: 80m variables: - IMAGE: ubuntu2004 + IMAGE: ubuntu2204 CONFIGURE_ARGS: --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu MAKE_CHECK_ARGS: check diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml index 96d2a3b58b..8637a13d86 100644 --- a/.gitlab-ci.d/containers.yml +++ b/.gitlab-ci.d/containers.yml @@ -13,10 +13,10 @@ amd64-debian-container: variables: NAME: debian-amd64 -amd64-ubuntu2004-container: +amd64-ubuntu2204-container: extends: .container_job_template variables: - NAME: ubuntu2004 + NAME: ubuntu2204 amd64-opensuse-leap-container: extends: .container_job_template diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index f34d88d33d..75233064de 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -146,6 +146,3 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" -# Apply patch https://reviews.llvm.org/D75820 -# This is required for TSan in clang-10 to compile with QEMU. -RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker new file mode 100644 index 0000000000..30b9e56793 --- /dev/null +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -0,0 +1,147 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --layers all ubuntu-2204 qemu +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/ubuntu:22.04 + +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 \ + bison \ + bsdextrautils \ + bzip2 \ + ca-certificates \ + ccache \ + clang \ + dbus \ + debianutils \ + diffutils \ + exuberant-ctags \ + findutils \ + flex \ + g++ \ + gcc \ + gcovr \ + genisoimage \ + gettext \ + git \ + hostname \ + libaio-dev \ + libasan5 \ + libasound2-dev \ + libattr1-dev \ + libbpf-dev \ + libbrlapi-dev \ + libbz2-dev \ + libc6-dev \ + libcacard-dev \ + libcap-ng-dev \ + libcapstone-dev \ + libcmocka-dev \ + libcurl4-gnutls-dev \ + libdaxctl-dev \ + libdrm-dev \ + libepoxy-dev \ + libfdt-dev \ + libffi-dev \ + libfuse3-dev \ + libgbm-dev \ + libgcrypt20-dev \ + libglib2.0-dev \ + libglusterfs-dev \ + libgnutls28-dev \ + libgtk-3-dev \ + libibumad-dev \ + libibverbs-dev \ + libiscsi-dev \ + libjemalloc-dev \ + libjpeg-turbo8-dev \ + libjson-c-dev \ + liblttng-ust-dev \ + liblzo2-dev \ + libncursesw5-dev \ + libnfs-dev \ + libnuma-dev \ + libpam0g-dev \ + libpcre2-dev \ + libpixman-1-dev \ + libpmem-dev \ + libpng-dev \ + libpulse-dev \ + librbd-dev \ + librdmacm-dev \ + libsasl2-dev \ + libsdl2-dev \ + libsdl2-image-dev \ + libseccomp-dev \ + libselinux1-dev \ + libslirp-dev \ + libsnappy-dev \ + libsndio-dev \ + libspice-protocol-dev \ + libspice-server-dev \ + libssh-dev \ + libsystemd-dev \ + libtasn1-6-dev \ + libubsan1 \ + libudev-dev \ + liburing-dev \ + libusb-1.0-0-dev \ + libusbredirhost-dev \ + libvdeplug-dev \ + libvirglrenderer-dev \ + libvte-2.91-dev \ + libxen-dev \ + libzstd-dev \ + llvm \ + locales \ + make \ + meson \ + multipath-tools \ + ncat \ + nettle-dev \ + ninja-build \ + openssh-client \ + pkgconf \ + python3 \ + python3-numpy \ + python3-opencv \ + python3-pillow \ + python3-pip \ + python3-sphinx \ + python3-sphinx-rtd-theme \ + python3-venv \ + python3-yaml \ + rpm2cpio \ + sed \ + socat \ + sparse \ + systemtap-sdt-dev \ + tar \ + tesseract-ocr \ + tesseract-ocr-eng \ + xfslibs-dev \ + zlib1g-dev && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + 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/c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff --git a/tests/docker/test-tsan b/tests/docker/test-tsan index 53d90d2f79..f6d6590e39 100755 --- a/tests/docker/test-tsan +++ b/tests/docker/test-tsan @@ -21,7 +21,7 @@ setup_tsan() tsan_log_dir="/tmp/qemu-test/build/tsan" mkdir -p $tsan_log_dir > /dev/null || true EXTRA_CONFIGURE_OPTS="${EXTRA_CONFIGURE_OPTS} --enable-tsan \ - --cc=clang-10 --cxx=clang++-10 \ + --cc=clang --cxx=clang++ \ --disable-werror --extra-cflags=-O0" # detect deadlocks is false currently simply because # TSan crashes immediately with deadlock detector enabled. diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index a5ea0efc3b..cc9e34ac87 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -69,13 +69,6 @@ def generate_cirrus(target, trailer=None): generate(filename, cmd, trailer) -ubuntu2004_tsanhack = [ - "# Apply patch https://reviews.llvm.org/D75820\n", - "# This is required for TSan in clang-10 to compile with QEMU.\n", - "RUN sed -i 's/^const/static const/g' /usr/lib/llvm-10/lib/clang/10.0.0/include/sanitizer/tsan_interface.h\n" -] - - # Netmap still needs to be manually built as it is yet to be packaged # into a distro. We also add cscope and gtags which are used in the CI # test @@ -113,8 +106,8 @@ try: trailer="".join(debian11_extras)) generate_dockerfile("fedora", "fedora-37") generate_dockerfile("opensuse-leap", "opensuse-leap-153") - generate_dockerfile("ubuntu2004", "ubuntu-2004", - trailer="".join(ubuntu2004_tsanhack)) + generate_dockerfile("ubuntu2004", "ubuntu-2004") + generate_dockerfile("ubuntu2204", "ubuntu-2204") # # Cross compiling builds From patchwork Tue Feb 28 19:06:38 2023 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: 657476 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097087wrb; Tue, 28 Feb 2023 11:08:54 -0800 (PST) X-Google-Smtp-Source: AK7set9mk6YC799zCWpIvz2/Jn//WZNSbwPAXp3X9TFu2TqMCZ6akqI0jce0rixN4hiG96uOaomE X-Received: by 2002:a05:622a:609:b0:3bf:bb09:28ca with SMTP id z9-20020a05622a060900b003bfbb0928camr6762062qta.18.1677611334206; Tue, 28 Feb 2023 11:08:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611334; cv=none; d=google.com; s=arc-20160816; b=YoLGzrm4CHBbi8StrhMpMNDE9XzA9xC3b8HsbSV9ZB7bggmpyjwn/fcVZ3PJ/HyvpR WTCt8X4/Pj1KBzq1WL/RrBdKwkUDA7Kb8itfYC4jsmtcjCqsDqVb7/K502W3YCkQquV6 UwEbdpsJyfnSe0jsF969+7G3IvlxV5mW0MC6RdeFLi4OiYmvh+6477nKuhGYDYbhQ4Gu iIM/Pprz5cpDgGXEnsj2MwRB7f+THjp4/mj5GUBkccvNjaX2jYb+jxeHKgwoCPMBrb9F yT9Om1pVjlfpxfrxu7ZVFL2N7/eMMR0/zcIQHoOiuppxMelPHEyr1w+x86wZ9t9U52Qf jY5w== 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=DuLX1vmB+IE2B4LVPxcMs0j9qWEubCalxVU5Ic/npCA=; b=0JZbGYZTuY7wlCHcJsI3PCj4je23bAaHO6GK8A0N++JT2Dk+CekpcnVjZO3VwzGvai O9LF0fzF9YPkgM+qUsuyO2HsL6xVz5HQVP2DsIj/++73vVLMbXgeha139SkCRqvllolI oyxWUs+vNdeM5K8034J16TuGttJUI22mOIZEbex1CgjPofNryfutWi7u2RKLW0LL6HB4 tduLoiGAYxggJ/OcVUV+qRjStgjnhSAqpFYMDkx3axGt/L/VLmSL/uUibKdaFgk1y+ZP uWKT6vlzExNqBad079mY9RKnNsxLX0NfwycgDh5KEFCurcIbl6aK+roOLze20zWwHom0 a90A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BcJEvD3e; 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 bm26-20020a05620a199a00b0070928ca3e6dsi9813904qkb.164.2023.02.28.11.08.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:08:54 -0800 (PST) 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=BcJEvD3e; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KF-0002ab-Cb; Tue, 28 Feb 2023 14:07:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jk-0002JK-8g for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:18 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JU-0002pb-9g for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:07 -0500 Received: by mail-wm1-x32b.google.com with SMTP id j3so7142023wms.2 for ; Tue, 28 Feb 2023 11:06:59 -0800 (PST) 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 :message-id:reply-to; bh=DuLX1vmB+IE2B4LVPxcMs0j9qWEubCalxVU5Ic/npCA=; b=BcJEvD3epxCq4VxDfEdBWKgmNUZksdF4mtUkHa81a04hwIXu5ILjntWnFWw7JsHB3w IpXahvnLibQ6dPBVzAmTdLV1X9zzs0bLCBhvsfowvOFB1vC5pwhdN3+vL2qmjXvuT4GL gzKqUlIQl7yaa1nzoTXUd7daOUTZQkuakl/iH34xqZnfOfCBAMvN+PeEnEMHeOOT8LLM 3QfwXRMZ9bAjc7kH0r2xBH6mmq7e4DkVRaeAo/jVBUQ0kv9IY+gOnkT+qrcbTqX9O+5I pyFb1MtUQ62IPvQysHFFeme0HuharYOMcZX12OPL1MlEL8mUT7HSb1uJB2U9nqZGfVB+ 0Ypg== 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:message-id:reply-to; bh=DuLX1vmB+IE2B4LVPxcMs0j9qWEubCalxVU5Ic/npCA=; b=f374BwE97roiuj0vEP9uPf3vH34TLDXJ7hK+yhcIL92Ss209hsPciSDI7GIp3o7YFT rN/4UL6rFboelT90Xep0k04siJTH1S+iybc+pz/RMcGUU0Jak06H2fIV53Fwd+8QgUNL V/py19WFAOuHZ6Poksaxv4SoJzABB0tPMvqimkyRJDcyt2Cz5csEpzQGas6qYzYfHNRm FIQK1dxaoxROLfAWkUEV8/RgJiFgd0v1GjKMZrjkOWdSjV63hQRc+iLRJAMfO4pEYRKL NeT1KKYcKyNLSH8/orlwnoPgjP4bhDsHSi+K+K9dWwtkRi8j3Elz2Rid4c+cw87Xej5M IG/A== X-Gm-Message-State: AO0yUKVEeYqa6c/0jy7gP21NNihiuSvqWXwMpT21O1c/Zce2Mmg0JQxV In8mTmMDSeg2IZxAir6NcmAxVw== X-Received: by 2002:a05:600c:997:b0:3eb:578d:ded3 with SMTP id w23-20020a05600c099700b003eb578dded3mr25154wmp.35.1677611218935; Tue, 28 Feb 2023 11:06:58 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m4-20020a05600c4f4400b003e209b45f6bsm18218029wmq.29.2023.02.28.11.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5A0F81FFBF; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 09/24] tests: skip the nios2 replay_kernel test Date: Tue, 28 Feb 2023 19:06:38 +0000 Message-Id: <20230228190653.1602033-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org It is buggy and keeps failing. Suggested-by: Peter Maydell Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230221094558.2864616-11-alex.bennee@linaro.org> --- tests/avocado/replay_kernel.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/avocado/replay_kernel.py b/tests/avocado/replay_kernel.py index 00a26e4a0c..f13456e1ec 100644 --- a/tests/avocado/replay_kernel.py +++ b/tests/avocado/replay_kernel.py @@ -349,6 +349,7 @@ def test_or1k_sim(self): file_path = self.fetch_asset(tar_url, asset_hash=tar_hash) self.do_test_advcal_2018(file_path, 'vmlinux') + @skip("nios2 emulation is buggy under record/replay") def test_nios2_10m50(self): """ :avocado: tags=arch:nios2 From patchwork Tue Feb 28 19:06:39 2023 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: 657483 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097586wrb; Tue, 28 Feb 2023 11:09:53 -0800 (PST) X-Google-Smtp-Source: AK7set8sWbDaGWOgeI8xeG4tftoIcehpY9r6rqvHwHaSBqMJt2YXTWyfeksaaBcjgfuPLPf6cQdi X-Received: by 2002:ac8:7d4c:0:b0:3b8:3a7c:d204 with SMTP id h12-20020ac87d4c000000b003b83a7cd204mr6660716qtb.58.1677611392944; Tue, 28 Feb 2023 11:09:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611392; cv=none; d=google.com; s=arc-20160816; b=0UKEG7otgkUK/tF1Vw94ReB8ozNjneXRnySZP0Tw1v/CuXiH+zhfi4+Ap020gsNxcs k7grNNNBcsmZ2t3CJ3mYxcfNhg/JMf3906QOVTngmdWuve/gN/SK/dJL/CxK72V4VUDF 8+519+9w7I7sKeDLL7PPfKezJB80xjHO6pHKCLp3iXKzKz8l71//GEZ6JvorZb0Hjzyp vdAwtWbvVpDagysRkF14oMoLRb4DJ5pBCFy9qzIUbjwTciKMnOsloP1b0oGxdGCtmr/h rYv297ZJZWr5DotVWYdvu6ya1RmkXJ+ImKU2wtmyJ/6FVlWdoPnRs0/fgyeU8Gwffq0U yxXA== 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=2UsmiCmuMSpLAXOo7qBUN5QG/8OVC9c/DhxXuI1b5sU=; b=w7Qp5ZavcAZJISJHPAbdCleB5J9HS157bFj6WgmSiL35Sh8OzmPkAy+5CiLYOxlPmO SS0jCTf1hLjwapBx45tPWGaKEC83dWgwgQoCfhX7o7mbp+hKSGZn2h/nAjtoDx3hu5Bw OBP23M3ItvHze/jXOOfnBzfIlICqfBIom9eZDm8uM+lP8SKVzAfgBBvIxCfRhX5YJ+J8 P4Tc2Dyt/1/rqreYYK4Wj7Hjqhvy65unoGZbEDCIONDp5c42BpFMGSUQbZNpFqjVAgT8 Ryc31jDabvMFeej3LtgW8LOQsd/FcgKwzga9usUHiWxnt6FSFv+Lp+Bdydn4LkwS+GaZ y/fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=clD+Bby8; 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 o12-20020a05622a044c00b003bfd9c0e3d6si5282741qtx.184.2023.02.28.11.09.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:52 -0800 (PST) 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=clD+Bby8; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KC-0002V3-09; Tue, 28 Feb 2023 14:07:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jk-0002JX-BX for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:18 -0500 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JV-0002ps-3M for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:12 -0500 Received: by mail-wr1-x436.google.com with SMTP id r18so10893467wrx.1 for ; Tue, 28 Feb 2023 11:07:00 -0800 (PST) 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 :message-id:reply-to; bh=2UsmiCmuMSpLAXOo7qBUN5QG/8OVC9c/DhxXuI1b5sU=; b=clD+Bby8HA3bKSrpfRGLF4wNswHXvFZ2pjwrSGjIMmaFKCeMk1vq1PUZSpYQllQsPr IS0K90qNFOtyp/7ZCWrIQIFNfAhz5KG2h336vAoh0sdpu8SLb7CrBkxJnejp5WAPd88S rhTXE92zxqeQAn/QQQ3TAMmeuAzWa8hNoCs4AIu8cyokualDiZoPqmy1Rq247CAa6TeN f+qb7fZ5KIR1LTS+teGN9DwqkX5OMti8XN6GepS7mGIsoWa2iC2iDGtMjbu5UDEzZGYE yAcCTm4uQrgDOA+JcGzSRV/e+t4hlqF1qmHfQ3JvsopTcgIyGRTl50hnRl17bdBdGpXg VvVA== 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:message-id:reply-to; bh=2UsmiCmuMSpLAXOo7qBUN5QG/8OVC9c/DhxXuI1b5sU=; b=CYde9aAUEqJs/3NXPAHx4/ckzyFXAzxUODFjk3gsT9A+2bc6aKFFwCYGC5fxha9+dC 95HbSzIwyEPlJks0j9tecCjuiK4v+6UY3/tBkpT0/k+IAq/gX1iwZ2P/bdmMRDlbZhoa c2Lnk5kuYCazVf/F7EtDNznjiHuVnDeJnLdFLIRWjHlbMIqZk02eSGIbUTrQQaIQhZV1 aIS1tudd1iJbpkIf5eQStk6w2yevFJjgj78MkYQe0PvV3wRSuqAXtIJPV5nvg/lvGtHI Vkz3GUp4OGgOL4y4TNlTfwJmcx0YzZXkr4D9YYENxTb0tm+VsN28kl6qPFGge30SWOKX yVVQ== X-Gm-Message-State: AO0yUKULKNaFT3EBZWKsmZtPOZn3n8xRxUOglt6gnS00igcOH3yojYh4 +Ne3qNOuplF1DaqWxL9NP5HZ7w== X-Received: by 2002:adf:ce8b:0:b0:2c9:a800:7d08 with SMTP id r11-20020adfce8b000000b002c9a8007d08mr2983645wrn.43.1677611219259; Tue, 28 Feb 2023 11:06:59 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id o25-20020a05600c511900b003dfe549da4fsm18945545wms.18.2023.02.28.11.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 78CB11FFC0; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta , Anders Roxell Subject: [PATCH v3 10/24] tests: add tuxrun baseline test to avocado Date: Tue, 28 Feb 2023 19:06:39 +0000 Message-Id: <20230228190653.1602033-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org The TuxRun project (www.tuxrun.org) uses QEMU to run tests on a wide variety of kernel configurations on wide range of our emulated platforms. They publish a known good set of images at: https://storage.tuxboot.com/ to help with bisecting regressions in either the kernel, firmware or QEMU itself. The tests are pretty lightweight as they contain just a kernel with a minimal rootfs which boots a lot faster than most of the distros. In time they might be persuaded to version their known good baselines and we can then enable proper checksums. For a couple of tests we currently skip: - mips64, a regression against previous stable release - sh4, very unstable with intermittent oops Total run time: 340s (default) -> 890s (debug) Overall coverage rate (tested targets + disabled tests): lines......: 16.1% (126894 of 789848 lines) functions..: 20.6% (15954 of 77489 functions) branches...: 9.3% (40727 of 439365 branches) Signed-off-by: Alex Bennée Cc: Anders Roxell Acked-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230221094558.2864616-12-alex.bennee@linaro.org> --- MAINTAINERS | 1 + tests/avocado/tuxrun_baselines.py | 423 ++++++++++++++++++++++++++++++ 2 files changed, 424 insertions(+) create mode 100644 tests/avocado/tuxrun_baselines.py diff --git a/MAINTAINERS b/MAINTAINERS index c6e6549f06..a1a7e46ce7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3760,6 +3760,7 @@ F: scripts/ci/ F: tests/docker/ F: tests/vm/ F: tests/lcitool/ +F: tests/avocado/tuxrun_baselines.py F: scripts/archive-source.sh F: docs/devel/testing.rst W: https://gitlab.com/qemu-project/qemu/pipelines diff --git a/tests/avocado/tuxrun_baselines.py b/tests/avocado/tuxrun_baselines.py new file mode 100644 index 0000000000..30aaefc1d3 --- /dev/null +++ b/tests/avocado/tuxrun_baselines.py @@ -0,0 +1,423 @@ +# Functional test that boots known good tuxboot images the same way +# that tuxrun (www.tuxrun.org) does. This tool is used by things like +# the LKFT project to run regression tests on kernels. +# +# Copyright (c) 2023 Linaro Ltd. +# +# Author: +# Alex Bennée +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import os +import time + +from avocado import skip, skipIf +from avocado_qemu import QemuSystemTest +from avocado_qemu import exec_command, exec_command_and_wait_for_pattern +from avocado_qemu import wait_for_console_pattern +from avocado.utils import process +from avocado.utils.path import find_command + +class TuxRunBaselineTest(QemuSystemTest): + """ + :avocado: tags=accel:tcg + """ + + KERNEL_COMMON_COMMAND_LINE = 'printk.time=0' + # Tests are ~10-40s, allow for --debug/--enable-gcov overhead + timeout = 100 + + def get_tag(self, tagname, default=None): + """ + Get the metadata tag or return the default. + """ + utag = self._get_unique_tag_val(tagname) + print(f"{tagname}/{default} -> {utag}") + if utag: + return utag + + return default + + def setUp(self): + super().setUp() + + # We need zstd for all the tuxrun tests + # See https://github.com/avocado-framework/avocado/issues/5609 + zstd = find_command('zstd', False) + if zstd is False: + self.cancel('Could not find "zstd", which is required to ' + 'decompress rootfs') + self.zstd = zstd + + # Process the TuxRun specific tags, most machines work with + # reasonable defaults but we sometimes need to tweak the + # config. To avoid open coding everything we store all these + # details in the metadata for each test. + + # The tuxboot tag matches the root directory + self.tuxboot = self.get_tag('tuxboot') + + # Most Linux's use ttyS0 for their serial port + self.console = self.get_tag('console', "ttyS0") + + # Does the machine shutdown QEMU nicely on "halt" + self.shutdown = self.get_tag('shutdown') + + # The name of the kernel Image file + self.image = self.get_tag('image', "Image") + + # The block device drive type + self.drive = self.get_tag('drive', "virtio-blk-device") + + self.root = self.get_tag('root', "vda") + + # Occasionally we need extra devices to hook things up + self.extradev = self.get_tag('extradev') + + 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 fetch_tuxrun_assets(self, dt=None): + """ + Fetch the TuxBoot assets. They are stored in a standard way so we + use the per-test tags to fetch details. + """ + base_url = f"https://storage.tuxboot.com/{self.tuxboot}/" + kernel_image = self.fetch_asset(base_url + self.image) + disk_image_zst = self.fetch_asset(base_url + "rootfs.ext4.zst") + + cmd = f"{self.zstd} -d {disk_image_zst} -o {self.workdir}/rootfs.ext4" + process.run(cmd) + + if dt: + dtb = self.fetch_asset(base_url + dt) + else: + dtb = None + + return (kernel_image, self.workdir + "/rootfs.ext4", dtb) + + def prepare_run(self, kernel, disk, dtb=None, console_index=0): + """ + Setup to run and add the common parameters to the system + """ + self.vm.set_console(console_index=console_index) + + # all block devices are raw ext4's + blockdev = "driver=raw,file.driver=file," \ + + f"file.filename={disk},node-name=hd0" + + kcmd_line = self.KERNEL_COMMON_COMMAND_LINE + kcmd_line += f" root=/dev/{self.root}" + kcmd_line += f" console={self.console}" + + self.vm.add_args('-kernel', kernel, + '-append', kcmd_line, + '-blockdev', blockdev) + + # Sometimes we need extra devices attached + if self.extradev: + self.vm.add_args('-device', self.extradev) + + # Some machines already define a drive device + if self.drive != "none": + self.vm.add_args('-device', + f"{self.drive},drive=hd0") + + # Some machines need an explicit DTB + if dtb: + self.vm.add_args('-dtb', dtb) + + def run_tuxtest_tests(self, haltmsg): + """ + Wait for the system to boot up, wait for the login prompt and + then do a few things on the console. Trigger a shutdown and + wait to exit cleanly. + """ + self.wait_for_console_pattern("Welcome to TuxTest") + time.sleep(0.2) + exec_command(self, 'root') + time.sleep(0.2) + exec_command(self, 'cat /proc/interrupts') + time.sleep(0.1) + exec_command(self, 'cat /proc/self/maps') + time.sleep(0.1) + exec_command(self, 'uname -a') + time.sleep(0.1) + exec_command_and_wait_for_pattern(self, 'halt', haltmsg) + + # Wait for VM to shut down gracefully if it can + if self.shutdown == "nowait": + self.vm.shutdown() + else: + self.vm.wait() + + def common_tuxrun(self, dt=None, haltmsg="reboot: System halted", + console_index=0): + """ + Common path for LKFT tests. Unless we need to do something + special with the command line we can process most things using + the tag metadata. + """ + (kernel, disk, dtb) = self.fetch_tuxrun_assets(dt) + + self.prepare_run(kernel, disk, dtb, console_index) + self.vm.launch() + self.run_tuxtest_tests(haltmsg) + + # + # The tests themselves. The configuration is derived from how + # tuxrun invokes qemu (with minor tweaks like using -blockdev + # consistently). The tuxrun equivalent is something like: + # + # tuxrun --device qemu-{ARCH} \ + # --kernel https://storage.tuxboot.com/{TUXBOOT}/{IMAGE} + # + + def test_arm64(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=cpu:cortex-a57 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:arm64 + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_arm64be(self): + """ + :avocado: tags=arch:aarch64 + :avocado: tags=cpu:cortex-a57 + :avocado: tags=endian:big + :avocado: tags=machine:virt + :avocado: tags=tuxboot:arm64be + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_armv5(self): + """ + :avocado: tags=arch:arm + :avocado: tags=cpu:arm926 + :avocado: tags=machine:versatilepb + :avocado: tags=tuxboot:armv5 + :avocado: tags=image:zImage + :avocado: tags=drive:virtio-blk-pci + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun(dt="versatile-pb.dtb") + + def test_armv7(self): + """ + :avocado: tags=arch:arm + :avocado: tags=cpu:cortex-a15 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:armv7 + :avocado: tags=image:zImage + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_armv7be(self): + """ + :avocado: tags=arch:arm + :avocado: tags=cpu:cortex-a15 + :avocado: tags=endian:big + :avocado: tags=machine:virt + :avocado: tags=tuxboot:armv7be + :avocado: tags=image:zImage + :avocado: tags=console:ttyAMA0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_i386(self): + """ + :avocado: tags=arch:i386 + :avocado: tags=cpu:coreduo + :avocado: tags=machine:q35 + :avocado: tags=tuxboot:i386 + :avocado: tags=image:bzImage + :avocado: tags=drive:virtio-blk-pci + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_mips32(self): + """ + :avocado: tags=arch:mips + :avocado: tags=machine:malta + :avocado: tags=cpu:mips32r6-generic + :avocado: tags=endian:big + :avocado: tags=tuxboot:mips32 + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_mips32el(self): + """ + :avocado: tags=arch:mipsel + :avocado: tags=machine:malta + :avocado: tags=cpu:mips32r6-generic + :avocado: tags=tuxboot:mips32el + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + @skip("QEMU currently broken") # regression against stable QEMU + def test_mips64(self): + """ + :avocado: tags=arch:mips64 + :avocado: tags=machine:malta + :avocado: tags=tuxboot:mips64 + :avocado: tags=endian:big + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_mips64el(self): + """ + :avocado: tags=arch:mips64el + :avocado: tags=machine:malta + :avocado: tags=tuxboot:mips64el + :avocado: tags=image:vmlinux + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=root:sda + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_ppc32(self): + """ + :avocado: tags=arch:ppc + :avocado: tags=machine:ppce500 + :avocado: tags=cpu:e500mc + :avocado: tags=tuxboot:ppc32 + :avocado: tags=image:uImage + :avocado: tags=drive:virtio-blk-pci + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_ppc64(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:pseries + :avocado: tags=cpu:POWER8 + :avocado: tags=endian:big + :avocado: tags=console:hvc0 + :avocado: tags=tuxboot:ppc64 + :avocado: tags=image:vmlinux + :avocado: tags=extradev:driver=spapr-vscsi + :avocado: tags=drive:scsi-hd + :avocado: tags=root:sda + """ + self.common_tuxrun() + + def test_ppc64le(self): + """ + :avocado: tags=arch:ppc64 + :avocado: tags=machine:pseries + :avocado: tags=cpu:POWER8 + :avocado: tags=console:hvc0 + :avocado: tags=tuxboot:ppc64le + :avocado: tags=image:vmlinux + :avocado: tags=extradev:driver=spapr-vscsi + :avocado: tags=drive:scsi-hd + :avocado: tags=root:sda + """ + self.common_tuxrun() + + def test_riscv32(self): + """ + :avocado: tags=arch:riscv32 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:riscv32 + """ + self.common_tuxrun() + + def test_riscv64(self): + """ + :avocado: tags=arch:riscv64 + :avocado: tags=machine:virt + :avocado: tags=tuxboot:riscv64 + """ + self.common_tuxrun() + + def test_s390(self): + """ + :avocado: tags=arch:s390x + :avocado: tags=endian:big + :avocado: tags=tuxboot:s390 + :avocado: tags=image:bzImage + :avocado: tags=drive:virtio-blk-ccw + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun(haltmsg="Requesting system halt") + + # Note: some segfaults caused by unaligned userspace access + @skipIf(os.getenv('GITLAB_CI'), 'Skipping unstable test on GitLab') + def test_sh4(self): + """ + :avocado: tags=arch:sh4 + :avocado: tags=machine:r2d + :avocado: tags=cpu:sh7785 + :avocado: tags=tuxboot:sh4 + :avocado: tags=image:zImage + :avocado: tags=root:sda + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=console:ttySC1 + """ + # The test is currently too unstable to do much in userspace + # so we skip common_tuxrun and do a minimal boot and shutdown. + (kernel, disk, dtb) = self.fetch_tuxrun_assets() + + # the console comes on the second serial port + self.prepare_run(kernel, disk, console_index=1) + self.vm.launch() + + self.wait_for_console_pattern("Welcome to TuxTest") + time.sleep(0.1) + exec_command(self, 'root') + time.sleep(0.1) + exec_command_and_wait_for_pattern(self, 'halt', + "reboot: System halted") + + def test_sparc64(self): + """ + :avocado: tags=arch:sparc64 + :avocado: tags=tuxboot:sparc64 + :avocado: tags=image:vmlinux + :avocado: tags=root:sda + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() + + def test_x86_64(self): + """ + :avocado: tags=arch:x86_64 + :avocado: tags=machine:q35 + :avocado: tags=cpu:Nehalem + :avocado: tags=tuxboot:x86_64 + :avocado: tags=image:bzImage + :avocado: tags=root:sda + :avocado: tags=drive:driver=ide-hd,bus=ide.0,unit=0 + :avocado: tags=shutdown:nowait + """ + self.common_tuxrun() From patchwork Tue Feb 28 19:06:40 2023 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: 657482 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097559wrb; Tue, 28 Feb 2023 11:09:51 -0800 (PST) X-Google-Smtp-Source: AK7set8asNd7vu3VQkz4C7HCZSPojTmAJNkA7YggGZMFXHQ1SjtM4m/qCMeF2fFzddVxX/2/p4T0 X-Received: by 2002:a05:6214:2461:b0:56e:b59d:2ee7 with SMTP id im1-20020a056214246100b0056eb59d2ee7mr8188419qvb.47.1677611391185; Tue, 28 Feb 2023 11:09:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611391; cv=none; d=google.com; s=arc-20160816; b=bEeBTTzl6upmAPb51s4rkWv1Udop/vnCqEIZKFFPBfm9Z1nXqfwqfFv+XIc2dSvuZH wUgk3P2ipAf796iTQgA4IoHa+sx8ItgixGx64V0S5tCShudCM2DARB2+d5YxWSNKTcwG tuGPqIEssG+Lx93aTF66g8H1jDRa3lZWU7Vr9ivvIW+MkmSh1mbSRkXb4K2JECwUzqZD 4JRjGHnhzl/LfLLYJCxiH7N2YmJQaSfaZfkuEAXPDuhQYH6/cgCL2VME8jJuPke9cNot 7VIv8kB+19PEPo8u7QhEmyYWiq6nnP6Bf2u0pogqtqd2iBR1/9MgxAUL6+c82ATutd11 ChxA== 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=bqKQZTDvOZ1wpytMTM7QInXR36A1/tJ8b2AKON/coNY=; b=Cn5Lmr1L0n5oDaWzjD4eJtgyZso15ZKftnz34aRb+Te5YClMAlj5sKiR7AKpheEsUl 98I64cyxlZtO16XgZlN37Io0HutiGTdFmEbpXCb1M7j6MAG4YeQg9XNCZvV8+Qq5x2G8 peE7Uhre46MRnDV2KelG7XzpZzQgnldiUFl1SH29h17XxmN6YcaoW1UrRVwNWjsMrTAn gmrLihIceB1oLNmcHtgjZJGPm14A7VKlRfbCoBqWxTad3q8w5TAYQ+bsNc6V/IMJz3LM 7hoNHRdtSZ0YmVy4XAZoFphYdNWhMHH53dKdjQ/K6M2Fhayd/qaDbvXmBWQAA2Olm7Eh oSKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=FryCXJ+g; 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 g3-20020a05620a40c300b0071fc1fee8aesi10568613qko.446.2023.02.28.11.09.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:51 -0800 (PST) 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=FryCXJ+g; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KH-0002b4-6H; Tue, 28 Feb 2023 14:07:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jk-0002JU-Ir for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:18 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JV-0002qB-Cb for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:11 -0500 Received: by mail-wr1-x42b.google.com with SMTP id r18so10893500wrx.1 for ; Tue, 28 Feb 2023 11:07:00 -0800 (PST) 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 :message-id:reply-to; bh=bqKQZTDvOZ1wpytMTM7QInXR36A1/tJ8b2AKON/coNY=; b=FryCXJ+g78WhQfGimALybwu64Dke8UWXuGPUyiAl6rnIduENmk4uQOcR5/Tq04hwfg rvw0dHHoskE3bHmbllyDV1f9Kfk5zVHbSB6DdGO2goC1RB4wqX3NVc7XyiwWoKcd2JAd kXwZfF6HQN9N44KdFvjYSw8LkO/FXdMtGR65Qk3s/65t+9Jb4cQs2lpdNID59D0sNeVR Php84ip1sY9toIqekvJYFMJJcScg3T0xJNsEyoqappnPUIXn1ek+/0Vp/7y7P466bgQW QgNadbi7+18A7PXnbrGZKN0R3Inm6DicUY2WI9nUOOrJ7+SHYADOTMuzT29S/kV28fA8 s9uw== 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:message-id:reply-to; bh=bqKQZTDvOZ1wpytMTM7QInXR36A1/tJ8b2AKON/coNY=; b=vvbvCqKYRUtQ5q3kzEJFf6wcY/zH3cW7S9gDfoeS49rMvlz2I6Va00UAtJt8F2q1Tw 36V3VJ72Kj8Oi9YwboX8WOFj98WCnXU1nJfBoNunEsrqa2yP2W5o0TYwWApbJArfIUU2 afHxxeLozYrlKMEm3l/BTZjbshtsdRHTOCe2KHY1TygdTjIHNEUSs0ha57S+kZ5eF7jh Gc/XUEypHeUv50DRqNvYzJuKhCJ1rDfH+dLq7SJNizqLZjaxW0cZ7X9HLo5eQjrDpUsN hCtVceiCaHu0dGQY8v5B33qpUQnEl8yq6rK0CsNnTjh/7ASwnayBlPvcbT2KQU+W9zwA sH2Q== X-Gm-Message-State: AO0yUKWqCQ0BLiF7bDhMtxrsem67zYEYX/Al88cuieE2UklsSW/YP7K2 3kTudJ8wY2ubOJZz4uVYcreuxA== X-Received: by 2002:a5d:5e8c:0:b0:2c3:d707:7339 with SMTP id ck12-20020a5d5e8c000000b002c3d7077339mr10670367wrb.6.1677611219745; Tue, 28 Feb 2023 11:06:59 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a14-20020a5d4d4e000000b002c57475c375sm10580099wru.110.2023.02.28.11.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 979B31FFC1; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 11/24] tests/docker: Use binaries for debian-tricore-cross Date: Tue, 28 Feb 2023 19:06:40 +0000 Message-Id: <20230228190653.1602033-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Bastian Koppelmann since binutils is pretty old, it fails our CI repeatedly during the compilation of tricore-binutils. We created a precompiled version using the debian docker image and download it instead of building it ourself. We also updated the package to include a newer version of binutils, gcc, and newlib. The default TriCore ISA version used by tricore-as changed from the old version, so we have to specify it now. If we don't 'test_fadd' fails with 'unknown opcode'. The new assembler also picks a new encoding in ld.h which fails the 'test_ld_h' test. We fix that by using the newest TriCore CPU for QEMU. The old assembler accepted an extra ')' in 'test_imask'. The new one does not, so lets remove it. Signed-off-by: Bastian Koppelmann Message-Id: <20230209145812.46730-1-kbastian@mail.uni-paderborn.de> Signed-off-by: Alex Bennée Message-Id: <20230221094558.2864616-13-alex.bennee@linaro.org> --- tests/tcg/tricore/macros.h | 2 +- tests/docker/dockerfiles/debian-tricore-cross.docker | 10 +++------- tests/tcg/tricore/Makefile.softmmu-target | 6 +++--- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/tcg/tricore/macros.h b/tests/tcg/tricore/macros.h index ec4f5bff52..3df2e0de82 100644 --- a/tests/tcg/tricore/macros.h +++ b/tests/tcg/tricore/macros.h @@ -174,7 +174,7 @@ test_ ## num: \ TEST_CASE_E(num, res_lo, res_hi, \ LI(DREG_RS1, rs1); \ rstv; \ - insn EREG_CALC_RESULT, imm1, DREG_RS1, imm2); \ + insn EREG_CALC_RESULT, imm1, DREG_RS1, imm2; \ ) diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 5ae58efa09..82e4576485 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -20,6 +20,7 @@ RUN apt update && \ bzip2 \ ca-certificates \ ccache \ + curl \ flex \ g++ \ gcc \ @@ -34,13 +35,8 @@ RUN apt update && \ python3-setuptools \ python3-wheel -RUN git clone --single-branch \ - https://github.com/bkoppelmann/tricore-binutils.git \ - /usr/src/binutils && \ - cd /usr/src/binutils && chmod +x missing && \ - CFLAGS=-w ./configure --prefix=/usr/local --disable-nls --target=tricore && \ - make && make install && \ - rm -rf /usr/src/binutils +RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download/tricore-toolchain-9.40/tricore-toolchain-9.4.0.tar.gz \ + | tar -xzC /usr/local/ # This image can only build a very minimal QEMU as well as the tests ENV DEF_TARGET_LIST tricore-softmmu diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/Makefile.softmmu-target index d2446af8b4..b3cd56fffc 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -1,7 +1,7 @@ TESTS_PATH = $(SRC_PATH)/tests/tcg/tricore -LDFLAGS = -T$(TESTS_PATH)/link.ld -ASFLAGS = +LDFLAGS = -T$(TESTS_PATH)/link.ld --mcpu=tc162 +ASFLAGS = -mtc162 TESTS += test_abs.tst TESTS += test_bmerge.tst @@ -19,7 +19,7 @@ TESTS += test_madd.tst TESTS += test_msub.tst TESTS += test_muls.tst -QEMU_OPTS += -M tricore_testboard -nographic -kernel +QEMU_OPTS += -M tricore_testboard -cpu tc27x -nographic -kernel %.pS: $(TESTS_PATH)/%.S $(HOST_CC) -E -o $@ $< From patchwork Tue Feb 28 19:06:41 2023 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: 657488 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3098287wrb; Tue, 28 Feb 2023 11:11:21 -0800 (PST) X-Google-Smtp-Source: AK7set+YIOou11FE29Tnd0rWz/M737LuOUNfBa7SB/g0+oHPgPUA/Z5VhuOzLl8iZkzDjwPChA2r X-Received: by 2002:a05:6214:124e:b0:56b:f1f7:c67f with SMTP id r14-20020a056214124e00b0056bf1f7c67fmr8400545qvv.6.1677611481224; Tue, 28 Feb 2023 11:11:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611481; cv=none; d=google.com; s=arc-20160816; b=sY7CfCUXYMk/w/n9OFvokmFBsa8axN18rOPOcYsIhFrkxNiC4E8THQr0cHCdwWaq1H jbsrXtwH1xEgmhI23dpWncYFtLGZNYc6X8bYd0oP25U0p/E67OQlO9qedixzcJAeloBr kQUI5evAXHRC/C5D/N0xonyTHh/AoK/kTddbGeXbkCzYn2rhnwzVuSPj5fz0COotT+G9 pSsxBRWKyecpA4VfFq/GdT32mhXJFrS50/nC7wHIvdSRx6XrEBTHAJFnI5CbNu2J86Fp pmGQILgXU1vVxN8Zo3hILFRcVmfC+nobVkXlMjIi9IX69XADRURUnD0pj5Zi0UAalP1S l3rA== 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=d4/zhLSmWu13QgiQEwsSfeYVh8tCmBtEQrl59j5YpTg=; b=PIrN4XCIsV/OEI8S2ezH91eUWM/pCK5D8oiDmL2Ts6GBIjpF2J9cIrrJS5P4R2zQ+D vRr3vbVBQ49wIiBaUNlXDaQ78UBoiONqQpvGKT6GoY0aGHEcPUY5z+1+IgwSufWyAnN1 L+/1oEJupHl52BCgEDgtJF7prb2zxwQ3a1UQEhiLpMEtgkyj0ccf/oUOJ1syEfGrxBL7 iyz2VKK8JLr25ZDELSD0N2giw5Ecj+mAugfnyHD5tSpRhqzT+J9HnF7/DDO8+ZdDc3jI d6JmNEx68awTepSvyk8fr8bGaZB6k+ufkdk0gcsJcJCnBom/afhS/pokqdqOXZNm3q/G i66g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rC4TFznc; 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 r9-20020a0c8d09000000b004c6d681587asi9243790qvb.15.2023.02.28.11.11.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:11:21 -0800 (PST) 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=rC4TFznc; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KE-0002Z9-8W; Tue, 28 Feb 2023 14:07:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jk-0002JP-Gb for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:18 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5JV-0002lm-CV for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:12 -0500 Received: by mail-wm1-x32a.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so10325123wms.2 for ; Tue, 28 Feb 2023 11:07:00 -0800 (PST) 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 :message-id:reply-to; bh=d4/zhLSmWu13QgiQEwsSfeYVh8tCmBtEQrl59j5YpTg=; b=rC4TFzncAMB3T8V8Yj44eWdFnaC9m1ZYtwQGg9xS11jJmWPrpvBHBpjt6HTaeDtMZF CLXYAQWThT3G2blEqiJhr1S/vl0FaUCFjYAQZTK454yq7kViK/Obg6vZu3nOKyaxBd1Y IXtP7B8h5tt1bxs3y9k5dqSeQ8zLTkUFGY0SSiHrv+N9VRorCoqCZddi10KM97kR1jsr zr3csqoqom6gedCTZfcJcjswivk2ziZB/UBptZAU+61llKr17aIYnpxCzV2JsV56FPp1 mOluBmQjK4VjlgVZkN5l76I2VSSD7dW4uFuUYZqxjwXoSUcGAGkZ1JtWiI63GZzmTFsi wz+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=d4/zhLSmWu13QgiQEwsSfeYVh8tCmBtEQrl59j5YpTg=; b=VR8YVcN/xNRcaBuoZBXEUP7cdCQW2PyyuOsZowIBSCKwpDSRH1MjII/6wegWbwltbW ucMPchx3okI4YDgbRA3Saz13zKdXreGS6LWI6Abj0isS0yXDgY5ryqJH/jR4DhkXSa2T yPisrQA/CtiOXxkYcNqp32FaqSLELNmFLmVf4zQljnR4aj4yrXZI/z4lltL8beFZkSE4 BZxD6rPWXCueZKIH8arUlp+8e/AEslqND7G376iSku3xFJx4BpWKlpeKshsz6jolszvU 1Fp4/pW7YBdNJvnqbsh+rmU6MU8NJajbdPLjTU6RA5iVOMEifyUcH7G+Vbl3LZ5E2kO/ 3cSg== X-Gm-Message-State: AO0yUKXTriQl7f2Jo+cyEOsYqVhHLM5HH2tK1K9p5zoJ46lgx0bH9S7S p+jFNaVYszyvnBCFTB4G2iOMqQ== X-Received: by 2002:a05:600c:a694:b0:3dc:4b87:a570 with SMTP id ip20-20020a05600ca69400b003dc4b87a570mr3395774wmb.35.1677611220433; Tue, 28 Feb 2023 11:07:00 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m4-20020a05600c4f4400b003e209b45f6bsm18218045wmq.29.2023.02.28.11.06.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:56 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B15711FFC2; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 12/24] tests: ensure we export job results for some cross builds Date: Tue, 28 Feb 2023 19:06:41 +0000 Message-Id: <20230228190653.1602033-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We do run tests on some cross builds. Provide a template to ensure we export the testlog to the build artefacts and report the test results via the junit. Signed-off-by: Alex Bennée Reported-by: Peter Maydell Reviewed-by: Thomas Huth Message-Id: <20230221094558.2864616-14-alex.bennee@linaro.org> --- .gitlab-ci.d/crossbuild-template.yml | 11 +++++++++++ .gitlab-ci.d/crossbuilds.yml | 12 +++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.d/crossbuild-template.yml b/.gitlab-ci.d/crossbuild-template.yml index d07989e3b0..4f93b9e4e5 100644 --- a/.gitlab-ci.d/crossbuild-template.yml +++ b/.gitlab-ci.d/crossbuild-template.yml @@ -49,3 +49,14 @@ 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 + +# We can still run some tests on some of our cross build jobs. They can add this +# template to their extends to save the build logs and test results +.cross_test_artifacts: + artifacts: + name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" + expire_in: 7 days + paths: + - build/meson-logs/testlog.txt + reports: + junit: build/meson-logs/testlog.junit.xml diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 101416080c..d3a31a2112 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -44,7 +44,9 @@ cross-arm64-user: IMAGE: debian-arm64-cross cross-i386-system: - extends: .cross_system_build_job + extends: + - .cross_system_build_job + - .cross_test_artifacts needs: job: i386-fedora-cross-container variables: @@ -52,7 +54,9 @@ cross-i386-system: MAKE_CHECK_ARGS: check-qtest cross-i386-user: - extends: .cross_user_build_job + extends: + - .cross_user_build_job + - .cross_test_artifacts needs: job: i386-fedora-cross-container variables: @@ -60,7 +64,9 @@ cross-i386-user: MAKE_CHECK_ARGS: check cross-i386-tci: - extends: .cross_accel_build_job + extends: + - .cross_accel_build_job + - .cross_test_artifacts timeout: 60m needs: job: i386-fedora-cross-container From patchwork Tue Feb 28 19:06:42 2023 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: 657477 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097203wrb; Tue, 28 Feb 2023 11:09:07 -0800 (PST) X-Google-Smtp-Source: AK7set8XZmviVepomBcKHKbUNoIZfPZPVb7CiU1rOakDlLpOUHelb2YRDZtvSQm3JqLt/4Dh1Pgb X-Received: by 2002:ad4:5d44:0:b0:570:ae8a:f34 with SMTP id jk4-20020ad45d44000000b00570ae8a0f34mr9141720qvb.21.1677611347365; Tue, 28 Feb 2023 11:09:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611347; cv=none; d=google.com; s=arc-20160816; b=vtbuR9CaZHzlwkEL+PcX8Fj1pENcJJWp7H427XEzRAvZM48fpMOguq+Ev6eSff/KJs pYgUJXUwHArBhWadhVFff+ASxbKu9z7jlti58yCrtVPurSrbLfRcsc9HB1FWdNRG9Tfg P5DwKJBpUPaCEhtwFpNon5Hh7UgQMPMD8LeuzqVwkmHyW5G3ngRnuEQdZWk/smpwTmdO 5S8gNv0RvaTYTpjV7gUMKFP/ot3A4lOCqL6gScfG1gUeQuwwMA2nfaEBbyWNR3vgWFXQ VZUitKsR18GV6UOpczl/eP/t/pbwRLmBTtQGUkyJjoV3udm2GLkQpceFAXrhH1WeWwYj +/pA== 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=bwZjYJyzhOZhmyFNjraG9Agw+3XX7xlS2XkV5ff6A7I=; b=TwvAzwdYhlScfi55HBPorXMQXgA1zgQj2ohFBVOhhdeTAQc/0bmRXKkj40O4shCG5x l8+gta4n+Ulb5eGt1JV+1NyXZ/M1QJsLouLuxKX9kvYDOs1OZ2arAr+Oie1ugvGM8hFj EwI0CabWBbHcNmFLnDKZYLDwDM8V2OG/xODg27n4fUT26Gh2W9XgRe75QEZnb7Oc0Tfp J2vN2h1JMu2gOkErMRRsmgYxo4CxGl7Ujub0ygZTgCFB3GZhgFR52anBEMU+4xXoyu3g WBT2EgvJ81bPFa0XIGVvfBwED7Td1yV7c5XmCqdSahFoapwBB9WzMM/uGEvnsUKV5Mzi vLKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DEQQx5Ch; 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 g18-20020a0cdf12000000b00569480deb50si9963679qvl.205.2023.02.28.11.09.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:07 -0800 (PST) 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=DEQQx5Ch; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KZ-0002sA-C7; Tue, 28 Feb 2023 14:08:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jq-0002Li-F5 for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:25 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Jm-0002qv-M4 for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:22 -0500 Received: by mail-wm1-x32a.google.com with SMTP id ay29-20020a05600c1e1d00b003e9f4c2b623so10313052wmb.3 for ; Tue, 28 Feb 2023 11:07:02 -0800 (PST) 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 :message-id:reply-to; bh=bwZjYJyzhOZhmyFNjraG9Agw+3XX7xlS2XkV5ff6A7I=; b=DEQQx5ChZ5MAaykpkZQv4I7hxf/e7KfsauK2NVdr4LbWR3sl3KAMx1gvOhkAVnTpoG 1dVYzLzEHgOldiTyOemeaFFU2DBRSI/pq5xbU5Mw7fhVIbjluQk0yUdxYc6YuUDPMe0O vBKlhVnDpKsvaxjW6blW0uP8abjVMs2iCmyO+86o7OTduPp2dkwdq4CXK753H3O2MWin esUpQy5XFd+oBhXcbY0VlMbBtlJwcyDFJq7Ur3I1V5hTCq12yvLE+LyAWCQWJQL04g7U uHoHTObvVP1yrUKX1vzEHGX3IEuXmyvKlKGI+nYOpQpzjk6MRMcopHnUI8SYrr8t4fcZ +K3Q== 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:message-id:reply-to; bh=bwZjYJyzhOZhmyFNjraG9Agw+3XX7xlS2XkV5ff6A7I=; b=gFPeGxQopQaCooAmHIt0lN6TsttK6GwbSyMpSiWBGNTjZHWhjJLwEAr/6SPXtTVN0o E+oMnZdtsW9TuPJM1i8EPOOWhy8gPQAqXPt8yDsvAEyPgir8uFEFaoxiMlvT7a+5oxql 4LLWq8frKA63YCogOCZxV8eZNTQpmVxGkca+u/i5Jdl7lOdiGUzzQ5bATLjfmVOKwPeQ +hP7exljBKab6L8vVkBWLgMQsTJNCfaYY1kCN5iR+PM4SniRL/X0rMXtBcQ+HHlPjR91 vGVX/s/4BLKm6YUml+KtiAJtyCLv2PbiLVH8lxa/xcTer69V8QjKQNFMklWKewn0wHpn a9tg== X-Gm-Message-State: AO0yUKXcC1v6Zu1BWZ/nfVcAzz3WO30VuWQFibVwZyuP43h8POejzmfL PFau+VK+d9YHBO4IY4NMOG64Iw== X-Received: by 2002:a05:600c:458b:b0:3e9:f4c2:b604 with SMTP id r11-20020a05600c458b00b003e9f4c2b604mr3325954wmo.24.1677611221243; Tue, 28 Feb 2023 11:07:01 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id ja6-20020a05600c556600b003dfefe115b9sm13569534wmb.0.2023.02.28.11.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:58 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C7EEF1FFC3; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 13/24] cirrus.yml: Improve the windows_msys2_task Date: Tue, 28 Feb 2023 19:06:42 +0000 Message-Id: <20230228190653.1602033-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Thomas Huth There's no need to run a full-blown bash just to create a directory. And we can skip the "cd build" each time by doing it once at the beginning. Additionally, let's exclude some targets (that we already compile-test with MinGW in the gitlab jobs) from the build, since the build time of this task is very long already (between 80 and 90 minutes). Signed-off-by: Thomas Huth Message-Id: <20230208103046.618154-1-thuth@redhat.com> Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20230221094558.2864616-15-alex.bennee@linaro.org> --- .cirrus.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4895987da4..5fb00da73d 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -100,9 +100,11 @@ windows_msys2_task: tar xf C:\tools\archive\msys64.tar Write-Output "Extract msys2 time taken: $((Get-Date).Subtract($start_time))" script: - - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3" - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8" + - mkdir build + - cd build + - C:\tools\msys64\usr\bin\bash.exe -lc "../configure --python=python3 + --target-list-exclude=i386-softmmu,ppc64-softmmu,aarch64-softmmu,mips64-softmmu,mipsel-softmmu,sh4-softmmu" + - C:\tools\msys64\usr\bin\bash.exe -lc "make -j8" - exit $LastExitCode test_script: - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check" From patchwork Tue Feb 28 19:06:43 2023 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: 657475 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3096799wrb; Tue, 28 Feb 2023 11:08:15 -0800 (PST) X-Google-Smtp-Source: AK7set9quKAvYWpHaqChdyd+k4oizUDbWkK2fUBJsb1kMo/rcsakPA0ecmsEantKLPXLFrZ2lSKj X-Received: by 2002:a05:6214:5013:b0:56e:f1fd:f177 with SMTP id jo19-20020a056214501300b0056ef1fdf177mr6822593qvb.42.1677611294896; Tue, 28 Feb 2023 11:08:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611294; cv=none; d=google.com; s=arc-20160816; b=y/NBR1UnMF/4kb/3y9WlbjL0nzmIAgb9/gA0Xz/tgpEwwd/FPUf/TRMDciD4mEMS8i 20MyxlTniFSf6PbOGrQdiwilFTZz6HbYxK4dTPg6BCN24bsvHQahFKt/QslhFVAdP10Z d/aUvwCanEgv1pcOM3cw3Ps9Qb03/QDyKDO81NVmjbxXJGg7oIdDN3dd6eJ+OvqB2nN9 SPNl0pBC+bbBuubcYXt+hsnPd6PFxBFZSrM6boLtIV7vUeWgqKZ7KPeXUk3Kvu21k+Xs U78CO9muJgMFdnfD60Z7npxqfjFBkYfOtZQn9iHGJsKOvJqg8dwKzgH5SpoHpJLZgDUs z0+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=9Qt5mFGK6sX05ojDaxMAjvkBlcEMddgn+Oj0DLlJ4YA=; b=ACWvI7arP/53bjsbMv+ZVuk/HnkjMzEd+BpwuLchURuuPNe932+JaGUcE5TMa8Dr12 B9SSGs/KPoIs4S2sZ9E0Fhbhj0QBxfPZQdU9GoaxyczheXds8aRQ7xpdnZpZbVtiG4iN +NyuyV52b+MzRp93vsSCMzHeCrz6m05gnex57U9gi42fpI9tmHuYDTJfpZPvGhbyg5yD mM0ZUIgZQiqS/5O510mm79UGxszmeLmvLppB30VJeVlaYBdLSCcojy/z2OZSN2Ab+n+a oWK6LFQxAXkHDEvHYY9zNeHKC2Z7a3cL8rGwgbitUE7GscdniZHBksjG3/Q4AFX0Ox/L sqHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mF+1ji7z; 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 d25-20020a0caa19000000b004c77f3d9e3dsi8754609qvb.278.2023.02.28.11.08.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:08:14 -0800 (PST) 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=mF+1ji7z; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KJ-0002bY-Gk; Tue, 28 Feb 2023 14:07:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jo-0002LU-7G for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:23 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Jj-0002lF-Qz for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:19 -0500 Received: by mail-wr1-x42f.google.com with SMTP id q16so10890758wrw.2 for ; Tue, 28 Feb 2023 11:07:01 -0800 (PST) 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 :message-id:reply-to; bh=9Qt5mFGK6sX05ojDaxMAjvkBlcEMddgn+Oj0DLlJ4YA=; b=mF+1ji7zNQ28pO6NBP3EfUyVvko1tHKSH/WLpIRB5b1/ecWQsUiPE0/PQHkNSO497S dSDF/QL8kNyi4JN5z6kmmLTkcwT4V41ySSXSEVAMA8YwsaYYsVEguuzmJgbLpaRrEB96 X2WNyI3exEINI3enQ5wpkLLl01djvTBamv6arCZXvZzaVGlMKU5Ni863WnhQEuO4Jim0 AZHPnu29qal5jVhIP/LJKcRdZm/prJWGv3SZRCYA/j//7ApParXCN94bDIgNyJGpRa/x W+N6qb9PYGvPrzTdoOXW/QzqGqcVQR4joOUSSN9QaaX2VEr0YqeXvdIHCKV+GjiALWou SYUQ== 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:message-id:reply-to; bh=9Qt5mFGK6sX05ojDaxMAjvkBlcEMddgn+Oj0DLlJ4YA=; b=HvEv68TejT8g0tC5fy/dvnhbVHD0/CaTkrZb/ONFrnIWHHOLQbou4GzYzq9joBZYq+ MrLuRB/tAf5D0QOMoUN2M0gN95r7a8OIDYA6NlkiI0s+0SqyyIknNHvJ5ybr43OA46G/ RnN+z5K/sQXLF2ZfZORRoRuoExFHz9bd169/BSaBJUWl+boiX9ZvmDbUjtwIr9nXsTxn kNpqNKewp5X11L4qG6VsadlkcjlilCPZIjfh3RRO3XA8y3yAcymNl6vGiwE7xwN5vIg7 NUPcBi8CPqJYq1VxDr24aWHLQSGw9HFX6HqaqqzvThFTcYS92lDcAm9kB9/JsZJoszzB qkww== X-Gm-Message-State: AO0yUKXEnU/FVu+pJV0yKYy0nqqCEYIIf6/b5liFUn6IVBXS2V2YQkI7 rNC/wB3jYyygN7NasR7IHrPdyw== X-Received: by 2002:a05:6000:789:b0:2c5:3fce:423b with SMTP id bu9-20020a056000078900b002c53fce423bmr2819757wrb.4.1677611221534; Tue, 28 Feb 2023 11:07:01 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d2-20020adfef82000000b002c5801aa9b0sm10730547wro.40.2023.02.28.11.06.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:06:59 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E10F31FFC4; Tue, 28 Feb 2023 19:06:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 14/24] tests/dockerfiles: unify debian-toolchain references Date: Tue, 28 Feb 2023 19:06:43 +0000 Message-Id: <20230228190653.1602033-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org We use the debian release number elsewhere so fix it for consistency along with the broken comment. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- tests/docker/dockerfiles/debian-toolchain.docker | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index 6c73408b34..dc9545857f 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -30,7 +30,7 @@ ADD build-toolchain.sh /root/build-toolchain.sh 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, +# and the build trees by restoring the original image, # then copying the built toolchain from stage 0. -FROM docker.io/library/debian:bullseye-slim +FROM docker.io/library/debian:11-slim COPY --from=0 /usr/local /usr/local From patchwork Tue Feb 28 19:06:44 2023 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: 657484 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097628wrb; Tue, 28 Feb 2023 11:09:58 -0800 (PST) X-Google-Smtp-Source: AK7set8nbonXmrA0zQtaa4WMsi0dG7WleH4K/RObUN4WmNrRPTZO468MVoO06WfqT7/e1aS5wWo1 X-Received: by 2002:a05:6214:2589:b0:56b:7cb:bdcd with SMTP id fq9-20020a056214258900b0056b07cbbdcdmr8863526qvb.39.1677611397902; Tue, 28 Feb 2023 11:09:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611397; cv=none; d=google.com; s=arc-20160816; b=UxWcC1ZKPFW0KtvjFJSErXuFhunjtH3KzaaDGtbGSROEafQIBNmb6Hj1NTpcMX1orG PhrL3bv4SsZJvqnF+sxlodEZ2CML3Cy8km0qLNR8igTMzPPi7i5+8D9QDA9K26KudcFh ZYTOTIcSdbwOJd/y5fe0/yhsru2JoFDXdNpTj76lYiMZxI4PV98l1lzlzf+Zamaig2WU XmP8WSlNuLvDUyotf69hKjrP9DE5FmNYMeaVL6vKezAaC8yvI4u0YKwt+yac+QQrMZss CRQTlqd784//0n7zAjDnT4BO6ehj/vOzsWvZTdiEylWTpt1O7Zg5VduY+llGinJA1VyH 3GuQ== 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=NDTxxrNGSUpGKhcca6dgBnJPO0C06Ehas+Oy5hwwxR8=; b=mM0eYE7pCDhLPcuMv28gB72cRgQw4jB7B8Do5u9Qxu9PL9yPqSLIVNDeQAlQymNfOa L1ptehr1I404YvtcvSN+VBkPwO54X8r6XQznI3IlPtaGd0mq+5zRLOMwegnJW8aBcwi6 udAuZAaWG1nEY5AuHr5Fu4jm1C+n66WE/z+m2munSzrjgGB5flAhSZzyi3dBPu4T+SDU XFcoCzXq1oRA5M9h5+ydqHA2803VHqXMGsHO0H/wIWny1B45jqVGVXxJJp5LlepHUVzH Ik9WtK28y1+mxN2XQytoYThWQW5Yoc4yBO9s5xsA0bVpcsNot1VHJVeOsrXf58qDxIxO 3s8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eDA1G5AW; 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 x123-20020a376381000000b007427120d009si8298876qkb.681.2023.02.28.11.09.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:09:57 -0800 (PST) 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=eDA1G5AW; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KD-0002YA-VV; Tue, 28 Feb 2023 14:07:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jo-0002LT-5a for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:23 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Ji-0002rl-Ll for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:18 -0500 Received: by mail-wm1-x32c.google.com with SMTP id ay29-20020a05600c1e1d00b003e9f4c2b623so10313085wmb.3 for ; Tue, 28 Feb 2023 11:07:03 -0800 (PST) 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 :message-id:reply-to; bh=NDTxxrNGSUpGKhcca6dgBnJPO0C06Ehas+Oy5hwwxR8=; b=eDA1G5AWVaSWAD6D2DDqSJhVG83H1GFv6hVKpsWkAlySE/p0JymrY0kHDajn+kKb8N YajCm5zeTWaJihWg53eYYBFUX62Z5k7eFCAH10B4pSd+GsCXZFuwicxR5Uoot3YQx27I omH+oAJ6pnCBvaUpmGT4kp4Ij9Rn2r/rU4H5QXtoUQ+8o2DzQFyHArbT52gL7WfbQIPF +hcy5KGuHpR/WT8QP2tAV5cUGgJgQhfclNxwmkH1pE8FEVfc95tIUFTpCAHVAI/aAcI8 Vy4aUq48JEgRccB3TC7TGJWkmULuWazYSLPLzxHUvJjUrrq8qODkOuI3/zXgXzwy94MW v0hw== 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:message-id:reply-to; bh=NDTxxrNGSUpGKhcca6dgBnJPO0C06Ehas+Oy5hwwxR8=; b=hjN0UAbiLPjSaHGsZu+8lgG7zp1FbqrW0jbBE9zTZ4Wv2ZrJnlcPdFdQqKRX20b3Fc MV/gVb+D1zqivPGTS+hf4tKyE7d668iylPurZwv7O9wPnTNYfN9iPw/LscqKOB2JSvNS M+ESJx/jr8teo++Cz5T71k+qQIUNDrm+WaWC84dmVDC4qsbIrodE3PMUuSJDN5DbbE6u YW7Wnjuvo36rdZqXOJMNgJpU1lhVcg9tb+HKZGUyfWC/fG4n74zX+4tFjazNHnVeaq/a z52LhL/SN+bifD3vWtUGnzYyKUxC6zWkVFjXSjMQIGHhCL6RWCpZ11WiJY5ML2Ffp6cH Jqcw== X-Gm-Message-State: AO0yUKXe6WXL/1G++IWxhz/YzwGfne2vdDqZgdLbX7WkqY8ziVd1zXk5 Uk7KsGVhKIldmG59iAJgf1TV8RrDhFOxkvWB X-Received: by 2002:a05:600c:3595:b0:3ea:c101:72b with SMTP id p21-20020a05600c359500b003eac101072bmr2809632wmq.17.1677611222333; Tue, 28 Feb 2023 11:07:02 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l4-20020a05600c1d0400b003db0ad636d1sm19450082wms.28.2023.02.28.11.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:07:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 048121FFC5; Tue, 28 Feb 2023 19:06:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta , Fabiano Rosas Subject: [PATCH v3 15/24] gitlab: Use plain docker in container-template.yml Date: Tue, 28 Feb 2023 19:06:44 +0000 Message-Id: <20230228190653.1602033-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org From: Fabiano Rosas Our dockerfiles no longer reference layers from other qemu images so we can now use 'docker build' on them. Also reinstate the caching that was disabled due to bad interactions with certain runners. See commit 6ddc3dc7a8 ("tests/docker: don't use BUILDKIT in GitLab either"). We now believe those issues to be fixed. The COMMON_TAG needed to be fixed for the caching to work. The docker.py script was not using the variable, but constructing the correct URL directly. Signed-off-by: Fabiano Rosas Tested-by: Daniel P. Berrangé Reviewed-by: Daniel P. Berrangé Message-Id: <20230227151110.31455-2-farosas@suse.de> Signed-off-by: Alex Bennée --- .gitlab-ci.d/container-template.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.d/container-template.yml b/.gitlab-ci.d/container-template.yml index c434b9c8f3..519b8a9482 100644 --- a/.gitlab-ci.d/container-template.yml +++ b/.gitlab-ci.d/container-template.yml @@ -6,17 +6,16 @@ - docker:dind before_script: - export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest" - - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest" + - export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/qemu/$NAME:latest" - apk add python3 - docker info - docker login $CI_REGISTRY -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - echo "TAG:$TAG" - echo "COMMON_TAG:$COMMON_TAG" - - ./tests/docker/docker.py --engine docker build - -t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker" - -r $CI_REGISTRY/qemu-project/qemu - - docker tag "qemu/$NAME" "$TAG" + - docker build --tag "$TAG" --cache-from "$TAG" --cache-from "$COMMON_TAG" + --build-arg BUILDKIT_INLINE_CACHE=1 + -f "tests/docker/dockerfiles/$NAME.docker" "." - docker push "$TAG" after_script: - docker logout From patchwork Tue Feb 28 19:06:45 2023 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: 657485 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097809wrb; Tue, 28 Feb 2023 11:10:21 -0800 (PST) X-Google-Smtp-Source: AK7set9MJQR681niQ5JzygRJ5JCSpV+wc2e4uMb4PJIeHGq+FCu4mazrN1yTz1o8ZU5xJj0Ae4Ch X-Received: by 2002:a05:6214:cac:b0:572:60e4:b6ba with SMTP id s12-20020a0562140cac00b0057260e4b6bamr8129674qvs.32.1677611421138; Tue, 28 Feb 2023 11:10:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611421; cv=none; d=google.com; s=arc-20160816; b=hLNdZoEkRTZ8Tt4C/Yuk109V1DY04OOx6J5SOKKKTiTTk/U/sm1DxovtPSTshcK414 2Ap21pCyzQj3TFwLxBDFojOORCP9Ief3KEz4HshB2pOiZxZGhE63Ia9zHxiIK/WDkCxf f1rDPTkP9LLPDDNd7Ck2Wc55qbG/fULxQuYtZE41C6LJlzDtfMvdMp6zGWK+L+l+TUBw +tD+rjz3tZs8s//xHzkBU1UEir9DuHLd8BOm4dRAi8KD6zZ6DruJFZC/1/dD3+fNgbsi d+TquRjqP428WgcZcSQgUvGZhLH2kDivMNd5o+RQlqeGP6HvQ8twxmdZMrge6RGj39+Y UdIA== 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=thQrLXkRWue5/igRIQt+F6mSv/9xFmIxivOvyRTxMxg=; b=wYLU0DqQZcbSKSbYDQNFuz728lI1fIjpt8ANj+2/bQQQ1mTWWWEf3nu3xxMEOJuwQK brQAwEhXXAYb2aovnzoVSoANnhIu2n8YduKs3Sv+10O7xVgc5JZO/ZetjC3QtpNP8XSP yv8w9zyPt8gYBMRL5u8FeqLaxu5KoskIdNhkI4NB5y8MGDijayuJT4o8NFr093By/sq4 wroUQSWjexskDRtqC6GNEEyK530nzq2hbrXaLm3ws6c1akTgEsqA9ze3u/6fkGyoBG6a 891CaqH3QQ+m+w0krEeeYdbVWaCeEcbgJU+eSo833AfY76MxaVciXA8Dz8T4hF4p+qP1 Cbhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=U+QeD1e9; 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 m20-20020a05620a24d400b0073b22c17aa9si9778202qkn.698.2023.02.28.11.10.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:10:21 -0800 (PST) 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=U+QeD1e9; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5K5-0002PF-QK; Tue, 28 Feb 2023 14:07:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jp-0002Lh-Oh for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:24 -0500 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Jk-0002ms-0O for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:21 -0500 Received: by mail-wm1-x32b.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so10325206wms.2 for ; Tue, 28 Feb 2023 11:07:03 -0800 (PST) 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 :message-id:reply-to; bh=thQrLXkRWue5/igRIQt+F6mSv/9xFmIxivOvyRTxMxg=; b=U+QeD1e9dYZV4RFaSK44k7dSd7yYjes2Nc9PEXHkIYldfLiDMa4iiJgeHD7Qmt1wFr HU3PvdgTdQ/1f3p+eVDPqrQePC2VbsYj8ZS5mjrikFWWSC6aamEU3BRdbXbcZbFahMTo 5Py8oXa16gSrkYu3HJ9Re5GllBU2VdgKH3kOHK82yS6X97fQzPV7q4/SbXGGwKJ0AKUg fi9VInFJx5uI/+jUQRgiZSmvQAz6KNo2Y1UlP6VUzX9Wq9xBxOY7jR2wXPGYijk0Q5LL blP0mKQgsuR1zTJ94wCA4vJZkj1kY8Cur2SqxKzM2NR3RZVVZc/aKvbiJqASDrCji/m5 3Gcg== 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:message-id:reply-to; bh=thQrLXkRWue5/igRIQt+F6mSv/9xFmIxivOvyRTxMxg=; b=Tcm1TTKxKhyIBlAiFGtRVt+UPJLX18I5W70ySoGSssnIhQyBoApFXOliSr4pboSTD8 9eWP41MuFk9RW3KXxk4krviwEkCrBsF+8Wu3CBHlaZH9YHp/6nCijHOwXNwEDJJhdNxK 10WQPkCeUA74UXsapC/RnmwYT4+6w0TCIXqEzfoGshblMw8XDxmW4HuUECJPlDsSrmRo zr+GvTY/gRUOuaeABIQBfnAyAM4Ir1i5H1zC743Fi2ogrigWycQBQuZbngCMEFzl+VRx ILoXX98CeLRDxQ/XWCKmntFmkZg3DqyqpYB97wjyw7q9oti5BReCIXEGiLefbsk+tWGb imGA== X-Gm-Message-State: AO0yUKUoqazTLkuIii2CTiEh55ymzqMvDzX9isJGHRLikmvLvAFPVYVq trjN2z+P2w+sGCk8JM3vFXAAJA== X-Received: by 2002:a05:600c:1992:b0:3ea:f0d6:5d36 with SMTP id t18-20020a05600c199200b003eaf0d65d36mr3057445wmq.29.1677611223084; Tue, 28 Feb 2023 11:07:03 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id a5-20020a5d4565000000b002c3f81c51b6sm10358330wrc.90.2023.02.28.11.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:07:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1FA811FFBB; Tue, 28 Feb 2023 19:06:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta , "Richard W.M. Jones" Subject: [PATCH v3 16/24] tests: Ensure TAP version is printed before other messages Date: Tue, 28 Feb 2023 19:06:45 +0000 Message-Id: <20230228190653.1602033-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org From: "Richard W.M. Jones" These two tests were failing with this error: stderr: TAP parsing error: version number must be on the first line [...] Unknown TAP version. The first line MUST be `TAP version `. Assuming version 12. This can be fixed by ensuring we always call g_test_init first in the body of main. Thanks: Daniel Berrange, for diagnosing the problem Signed-off-by: Richard W.M. Jones Reviewed-by: Daniel P. Berrangé Tested-by: Philippe Mathieu-Daudé Reviewed-by: Alexander Bulekov Reviewed-by: Darren Kenny Message-Id: <20230227174019.1164205-1-rjones@redhat.com> Signed-off-by: Alex Bennée --- tests/qtest/fuzz-lsi53c895a-test.c | 4 ++-- tests/qtest/rtl8139-test.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/qtest/fuzz-lsi53c895a-test.c b/tests/qtest/fuzz-lsi53c895a-test.c index a9254b455d..2012bd54b7 100644 --- a/tests/qtest/fuzz-lsi53c895a-test.c +++ b/tests/qtest/fuzz-lsi53c895a-test.c @@ -112,12 +112,12 @@ static void test_lsi_do_dma_empty_queue(void) int main(int argc, char **argv) { + g_test_init(&argc, &argv, NULL); + if (!qtest_has_device("lsi53c895a")) { return 0; } - g_test_init(&argc, &argv, NULL); - qtest_add_func("fuzz/lsi53c895a/lsi_do_dma_empty_queue", test_lsi_do_dma_empty_queue); diff --git a/tests/qtest/rtl8139-test.c b/tests/qtest/rtl8139-test.c index 1beb83805c..4bd240e9ee 100644 --- a/tests/qtest/rtl8139-test.c +++ b/tests/qtest/rtl8139-test.c @@ -207,9 +207,10 @@ int main(int argc, char **argv) verbosity_level = atoi(v_env); } + g_test_init(&argc, &argv, NULL); + qtest_start("-device rtl8139"); - g_test_init(&argc, &argv, NULL); qtest_add_func("/rtl8139/nop", nop); qtest_add_func("/rtl8139/timer", test_init); From patchwork Tue Feb 28 19:06:46 2023 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: 657496 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3102534wrb; Tue, 28 Feb 2023 11:21:07 -0800 (PST) X-Google-Smtp-Source: AK7set+ACYCjPwMBUHYF1YjI7Lw06Htv+3fLb6uHGfV90hR516wP0nXS77YGJtTxrlrscSoPqgeN X-Received: by 2002:a05:622a:1448:b0:3bf:c5ce:127a with SMTP id v8-20020a05622a144800b003bfc5ce127amr7599052qtx.4.1677612067451; Tue, 28 Feb 2023 11:21:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677612067; cv=none; d=google.com; s=arc-20160816; b=zhPbzu8sdhaVFtsneOqtthTjbcMUlf4DWLP2mePYEGa7VTt0Bfj7aIg6aNrEyNz4oL d7p4hFU0zzSIpEJv7GvEc6me0KqDjlznHL/Rj8UBikmIB9+KFwYyYKnctI/yN+qpowIz wYV6Omy6P7t3B63pc7hKxMbwfnNS3zoc7Q2VMlAimlxeloXR8AhBHxyj6nHBn+Yo50pC KcDQx0g23JD8mQ4ElbkRde8fUzn1ANwUlInXXop2426jKfVATc3MOX5BxlAHGEqaIcNa NFAUNQFokEaTs8mFDgbqxDZbL5AMu6EOyZHdj37StOLnHDJhHSE9XaP1FZj1L8r06H+w fhkQ== 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=xt3eb+HaT4XEXo3IRutOvZXV+aViTUge+mDFXoTsYYE=; b=DTrYkS+9AM7NvZ3yFonNULjsKPp/YzUcg3AQBq6NzLWKGXPl5IPKZymWlRgB13iGtE 36SI7bdWtzqt5rQlF7pLZvblWy9neLbID9XXrOXPN/VmL+5R4ANV7yjmPS65p/km50f5 ki3Tu60rYN2nIWuxY5O4OV4aPQ2QrAzTMiIoFkyWuV8e0ofjoaGCC+Wjtvgxj04juCbD evAdtf+uHRmLBiSBeL3nbctjQDGN5F8+r3htTWJb0GBYRItj+LsEmUXemoxH8d5DSwLF gfjIJTuQ93oWPjtMcsWCtd5kXdA37npLilh2av4pZAQJex3gaKw4hOq1X1ZZ7iN8XkIf WrJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gWHn1qkC; 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 m2-20020a05620a290200b00741b9cf3f1csi11351077qkp.23.2023.02.28.11.21.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:21:07 -0800 (PST) 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=gWHn1qkC; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5Wp-0007OY-01; Tue, 28 Feb 2023 14:20:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Wn-0007Nw-Db for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:20:45 -0500 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Wk-00062H-VT for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:20:44 -0500 Received: by mail-lf1-x133.google.com with SMTP id m7so14607099lfj.8 for ; Tue, 28 Feb 2023 11:20:42 -0800 (PST) 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 :message-id:reply-to; bh=xt3eb+HaT4XEXo3IRutOvZXV+aViTUge+mDFXoTsYYE=; b=gWHn1qkCdict7Yi1ZCiJP3IL2ctfQg7WD8LgjS4GduS3XxFab5s67Qr/zse4q6a7Rl 33mrW/cdm655PmGp/GJwDfCLUWiZidw1xTztgpWt9mjyXG5vL9ZhrZAAzidGEY+7oISR ixNXsIJwQZQdZEPRpdEg1M6ql5+384SyAPYxdkHgyglSQtHJ5ZM8QB+tDhR/M/h56Qcr K9HYXNSyItRt9bpfjY9EX90tOArMu0rEPjHB5Zp4HC6mY5HoM3ttix23FhCG3wzd3m8T 8fdHjKfWF93SfuSdvlCxLFHxb+IUumsRu1x41/Rv8ucbHYJKeVcha3toJoH91fE7Ak/8 koSA== 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:message-id:reply-to; bh=xt3eb+HaT4XEXo3IRutOvZXV+aViTUge+mDFXoTsYYE=; b=A5BeQOJPDkyQn5JagoogiBNTERY0F4qtlVW/HLOYNN50rNujl/91ZvAT3FSydYwLCu TMuAul8phCpd6x24a6XthV+LlnuB5RWVJE40+sAU0W8wmpRFP+mMbOiVLrfagnaZo7ZJ BCZ+4cRFZ+V513lN49hKAVthh9LhIKG2v9lHfuqm0bkNQtGSI5iZmnyjHRauNA3eDaLs ARr2QP7+8LIoRyiFV8/bivUMBEu+eXHA1gbz9isxRjj0HlYKDRiSY6EVbrcYL3srv6lZ 4VREVpgel7XNIYRkEeci22VSxUbajy/vi0XIB/cRktQ0HpIVobMNRuu4aL0sDa56byM7 wMlw== X-Gm-Message-State: AO0yUKUlYikQfp7+w0ozajT6utfX5U1/trkhxhkw5ji86O2zd7uh5z0g T0e8TBRMfOWtGfzfuUkyZicOQVUVQqcdzmyP X-Received: by 2002:a05:600c:358f:b0:3e9:9fc5:2c6d with SMTP id p15-20020a05600c358f00b003e99fc52c6dmr3149536wmq.14.1677611660616; Tue, 28 Feb 2023 11:14:20 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id u4-20020adfed44000000b002c563b124basm10673883wro.103.2023.02.28.11.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:14:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 399FC1FFC6; Tue, 28 Feb 2023 19:06:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 17/24] configure: expose the direct container command Date: Tue, 28 Feb 2023 19:06:46 +0000 Message-Id: <20230228190653.1602033-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::133; envelope-from=alex.bennee@linaro.org; helo=mail-lf1-x133.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In the process of migrating away from using docker.py to build our containers we need to expose the command to the build environment. The script is still a useful way to probe which command works though. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Signed-off-by: Alex Bennée --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index dccb5d4f96..1e36e05c37 100755 --- a/configure +++ b/configure @@ -1748,6 +1748,7 @@ fi # functions to probe cross compilers container="no" +runc="" if test $use_containers = "yes" && (has "docker" || has "podman"); then case $($python "$source_path"/tests/docker/docker.py probe) in *docker) container=docker ;; @@ -1756,6 +1757,7 @@ if test $use_containers = "yes" && (has "docker" || has "podman"); then esac if test "$container" != "no"; then docker_py="$python $source_path/tests/docker/docker.py --engine $container" + runc=$($python "$source_path"/tests/docker/docker.py probe) fi fi @@ -2355,6 +2357,7 @@ fi if test "$container" != no; then echo "ENGINE=$container" >> $config_host_mak + echo "RUNC=$runc" >> $config_host_mak fi echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak From patchwork Tue Feb 28 19:06:47 2023 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: 657495 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3102174wrb; Tue, 28 Feb 2023 11:20:19 -0800 (PST) X-Google-Smtp-Source: AK7set/xmuzWVfkmUoKlCsz3HnjQRSWduZ/6obKGNW8qiB1aba/RpAyo05J+9vnpd9YSzXGD1qq/ X-Received: by 2002:ac8:5a05:0:b0:3bf:dc55:ab0b with SMTP id n5-20020ac85a05000000b003bfdc55ab0bmr7694144qta.42.1677612019333; Tue, 28 Feb 2023 11:20:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677612019; cv=none; d=google.com; s=arc-20160816; b=Y3P+KRXwDmyi1gbsacu++RjtWwelr5gdLHLP6kf1M9YcIhyrm3e5pd3oo1UuIb1HN6 C/V6T9rOzTpOH+exUICdJVDi815UgqUjWDf/kS6p6F9DU6SwrEiOZj770jZqWR4Ll3fl i4QVIBXvaOTPCNCctIsCLUiqghaZurRAzdKw0lPP5Q3O8jSCG61IJOyor6xO6CBaYuPp 9PTV4ekaw2zVjGtI6J4spp9yUrN61AGB26vLtdmez4KZgUA8OCBoAISN0UyXBX/cwlbS r55qRtgQLxfN4aKBlKcvH1fXdupSpgAt1a9IhoxVa4dVUih8wM9ITZ4LFTB1/REBP7W9 51dA== 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=JwYY7NV09cuWvizRWq2tp0nWcEdq1eb5rB5IMzSHL4s=; b=uSb61QHAwWxWB+I3fktey/Mzr0+/4sARsgJ5bmTALBjHbOG3H0SnVKXaOpq/CDFsK3 dXFwwQiNtFdLmdiK4x9+kxCflQKhdKCLAI3dostDeJ2RwzkFxwAhXsFzUJocjKTiSit1 41kimngKoTXMgoPhk3Gdv/9jYjqnxfTcbk6ZdiwClrktSfGHsdQIwDOkC3YsaDbv1gzr b5eK+u8jNAVkFW++ErS/dFrEkP0IBdRqR07GnIWWpSMJamvnjXsD++IYnULst8LPzw62 FXeIBrbuU7buI2hWP3ZU3uJewZ8o9kEKk8xbLlwW4crLyiV4fJCpqCkSrpQvUHQvjFuF sjCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wqsw2txH; 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 q191-20020a3743c8000000b0074196bfbbd2si8017929qka.407.2023.02.28.11.20.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:20:19 -0800 (PST) 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=wqsw2txH; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5W2-0006cm-FX; Tue, 28 Feb 2023 14:19:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5W1-0006ce-Dp for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:19:57 -0500 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Vy-0005f5-VK for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:19:57 -0500 Received: by mail-ed1-x52e.google.com with SMTP id da10so44541559edb.3 for ; Tue, 28 Feb 2023 11:19:54 -0800 (PST) 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 :message-id:reply-to; bh=JwYY7NV09cuWvizRWq2tp0nWcEdq1eb5rB5IMzSHL4s=; b=wqsw2txH5VO9O9QSv5ebkcEyxfPgnY+FELStlf4FepgUBeNpTFGnqqJ4gq3vZkpexC ZHdvotIhm5zd3YYHaXd3ne04C3vOacnN7ijJfjJQefztaM//HDb8dKRaverH7PPnT64E exdarxk2J4huwVE60jtnoOg+kxmbMBZk+ykJAYxruiArxInGorUiwANICTVxt0enRWrk 6aCfliBG4jMG5pwdEdN1NXqz0A5jMK5n24zwejIHbsvp2vccZFxYhPqAuhrdCbek8IH5 iwTNdbZ/ud8De+OFg6vD63z63cDX5f5H2sLZZnyofovYPglUV+L+Cl3VL9WwCHOypnxV QGIg== 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:message-id:reply-to; bh=JwYY7NV09cuWvizRWq2tp0nWcEdq1eb5rB5IMzSHL4s=; b=6ds/+3qLrJ2769DhIXeeFCGTy//K93nIT6N0XDZAVXX2m58v0G1wJhTSZFpBbXztB9 BAOminIP34ujKsU1jI5CcUmRdMK0y+xSbYC3fG3uddHtGZgkix2oqQLQVHco2zLRdvOn BaHZ3Bo7Ot3BTJpswQqbxzzd6kyAkaGi0Cy1G/UEZ+wUTYKK7US4rOxprkKugQyrxYW8 tR8Hmh5GRYVuGgu2a7VYR3ufe8yeLRvVa9wiaf9No+KmOXYb2LavTB4ogV3utDji8Oqf m8Ygw6qz2WGkzGw147sDGq1YyKMGWHbMUyVmtFXCOt7sR2Iw7WNJfJlH4A/W+Cug786O ml6w== X-Gm-Message-State: AO0yUKUOm+2bl2p3Uv0VdKfGA+QDnJfzZvD8hmDTRF/PVHdsFqiIulPo 759l5h96dryfoVca4NXfPwwUavNQoZqDJlP1 X-Received: by 2002:a05:600c:474f:b0:3eb:2e27:2d0c with SMTP id w15-20020a05600c474f00b003eb2e272d0cmr3192099wmo.1.1677611663157; Tue, 28 Feb 2023 11:14:23 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id z23-20020a1c4c17000000b003e2066a6339sm13120526wmf.5.2023.02.28.11.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:14:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 83DED1FFBA; Tue, 28 Feb 2023 19:06:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 18/24] tests/lcitool: append user setting stanza to dockerfiles Date: Tue, 28 Feb 2023 19:06:47 +0000 Message-Id: <20230228190653.1602033-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52e; envelope-from=alex.bennee@linaro.org; helo=mail-ed1-x52e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org For the cross-compilation use-case it is important to add the host user to the dockerfile so we can map them to the docker environment when cross-building files. Signed-off-by: Alex Bennée Reviewed-by: Daniel P. Berrangé --- v2 - don't apply USER/UID to cirrus images --- tests/docker/dockerfiles/alpine.docker | 5 +++++ tests/docker/dockerfiles/centos8.docker | 5 +++++ .../docker/dockerfiles/debian-amd64-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-amd64.docker | 5 +++++ .../docker/dockerfiles/debian-arm64-cross.docker | 5 +++++ .../docker/dockerfiles/debian-armel-cross.docker | 5 +++++ .../docker/dockerfiles/debian-armhf-cross.docker | 5 +++++ .../dockerfiles/debian-mips64el-cross.docker | 5 +++++ .../docker/dockerfiles/debian-mipsel-cross.docker | 5 +++++ .../dockerfiles/debian-ppc64el-cross.docker | 5 +++++ .../docker/dockerfiles/debian-s390x-cross.docker | 5 +++++ .../docker/dockerfiles/fedora-win32-cross.docker | 5 +++++ .../docker/dockerfiles/fedora-win64-cross.docker | 5 +++++ tests/docker/dockerfiles/fedora.docker | 5 +++++ tests/docker/dockerfiles/opensuse-leap.docker | 5 +++++ tests/docker/dockerfiles/ubuntu2004.docker | 5 +++++ tests/docker/dockerfiles/ubuntu2204.docker | 5 +++++ tests/lcitool/refresh | 15 +++++++++++++++ 18 files changed, 100 insertions(+) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 56cf14e553..33e4823400 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -124,3 +124,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 1291ae1b04..28c5e7e43c 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -134,3 +134,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 856db95100..5d03b5c22d 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -169,3 +169,8 @@ 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 +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index e3dba71ad5..febc46e700 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -155,3 +155,8 @@ RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap RUN cd /usr/src/netmap && git checkout v11.3 RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kernel-dir=$(ls -d /usr/src/linux-headers-*-amd64) && make install ENV QEMU_CONFIGURE_OPTS --enable-netmap +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index b00e9e9bcf..b9501a21bc 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -168,3 +168,8 @@ ENV ABI "aarch64-linux-gnu" ENV MESON_OPTS "--cross-file=aarch64-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=aarch64-linux-gnu- ENV DEF_TARGET_LIST aarch64-softmmu,aarch64-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index fb1129f256..f21742ede5 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -167,3 +167,8 @@ ENV ABI "arm-linux-gnueabi" ENV MESON_OPTS "--cross-file=arm-linux-gnueabi" ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabi- ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user,armeb-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 7a2b864a38..decdeda6f2 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -168,3 +168,8 @@ ENV ABI "arm-linux-gnueabihf" ENV MESON_OPTS "--cross-file=arm-linux-gnueabihf" ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabihf- ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 5a3340e964..1df05fcf20 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -165,3 +165,8 @@ ENV ABI "mips64el-linux-gnuabi64" ENV MESON_OPTS "--cross-file=mips64el-linux-gnuabi64" ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips64el-linux-gnuabi64- ENV DEF_TARGET_LIST mips64el-softmmu,mips64el-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 422fdebe8f..019b8dcaff 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -165,3 +165,8 @@ ENV ABI "mipsel-linux-gnu" ENV MESON_OPTS "--cross-file=mipsel-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=mipsel-linux-gnu- ENV DEF_TARGET_LIST mipsel-softmmu,mipsel-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 78d7ae6211..3ceab4c502 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -167,3 +167,8 @@ ENV ABI "powerpc64le-linux-gnu" ENV MESON_OPTS "--cross-file=powerpc64le-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc64le-linux-gnu- ENV DEF_TARGET_LIST ppc64-softmmu,ppc64-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index d06ea3605a..6c216dde48 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -166,3 +166,8 @@ ENV ABI "s390x-linux-gnu" ENV MESON_OPTS "--cross-file=s390x-linux-gnu" ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu- ENV DEF_TARGET_LIST s390x-softmmu,s390x-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index 21ed1c6081..a5689b616b 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -100,3 +100,8 @@ ENV ABI "i686-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw32.meson" ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-w64-mingw32- ENV DEF_TARGET_LIST i386-softmmu +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index 95d30e7936..c066c20241 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -100,3 +100,8 @@ ENV ABI "x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=/usr/share/mingw/toolchain-mingw64.meson" ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- ENV DEF_TARGET_LIST x86_64-softmmu +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 8e06d080b8..4dd1fce890 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -146,3 +146,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 568c1c979f..7ea22a8c1e 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -137,3 +137,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 75233064de..ed5855295f 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -146,3 +146,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index 30b9e56793..6fea090f02 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -145,3 +145,8 @@ ENV LANG "en_US.UTF-8" ENV MAKE "/usr/bin/make" ENV NINJA "/usr/bin/ninja" ENV PYTHON "/usr/bin/python3" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index cc9e34ac87..c0d7ad5516 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -53,6 +53,15 @@ def generate(filename, cmd, trailer): content += trailer atomic_write(filename, content) +# Optional user setting, this will always be the last thing added +# so maximise the number of layers that are cached +add_user_mapping = [ + "# As a final step configure the user (if env is defined)", + "ARG USER", + "ARG UID", + "RUN if [ \"${USER}\" ]; then \\", + " id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi\n" +] def generate_dockerfile(host, target, cross=None, trailer=None): filename = Path(src_dir, "tests", "docker", "dockerfiles", host + ".docker") @@ -60,6 +69,12 @@ def generate_dockerfile(host, target, cross=None, trailer=None): if cross is not None: cmd.extend(["--cross", cross]) cmd.extend([target, "qemu"]) + + if trailer is not None: + trailer += "\n".join(add_user_mapping) + else: + trailer = "\n".join(add_user_mapping) + generate(filename, cmd, trailer) From patchwork Tue Feb 28 19:06:48 2023 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: 657486 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3097894wrb; Tue, 28 Feb 2023 11:10:32 -0800 (PST) X-Google-Smtp-Source: AK7set/qX3Y0foTHm3boIwa76FLsM0nd7zRcQf5N68TltuNgCzipLITGqBl/gKDZ+KuR3E+FPcoJ X-Received: by 2002:ad4:5e8c:0:b0:56e:9a34:4eaf with SMTP id jl12-20020ad45e8c000000b0056e9a344eafmr6542402qvb.36.1677611432677; Tue, 28 Feb 2023 11:10:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611432; cv=none; d=google.com; s=arc-20160816; b=Srz1NRp5w+WPXn0pyDNCoStI9ujFtLp2Jy48cuvetNjkT2WNOEnSGpbktNbAaoHc0W utWDZcCb1jyPEDNn5qGNCddXi6bymhqO3pTDm8OERAhzLzejl10k17VJD260IGkTJFKg +/lxur5qc/ZRdzjOjbKM4lf+dnDrOvHqaOsnDSXL/Nip3KECnfq9CcwO/GKou4jP4coL c2cIGCbkONkJShOzxENM+9jwiE0GgFv3hMZUrZX7qxhjUxbxc/D6O/th45djgtCcI2J6 PacvXy52vY1jOGGbJiMg11HuQ4VznxjjXXESS5f2L8Qv8mi9ohL8fe66nR5ziIxply0B LNtA== 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=NV5c9ZkKt6Q2cnLXaD8Zu/a6gkE2KjhBbGJKeHd9aTc=; b=KtDZj6le2OJDJwv7lNrxG9SC5bsV4E+Des2lUrqlvaglfB6BHhH/Q3mkP7tGZA1gbD pVm3bSh6+ErHs0y6sBynrNPAbqyzTcClScjNuL2HchRAlAEonv8PuDHKR99FFAlPwaPB 090tS33YWi9mail6r0RMGJpE96PUDaG1nRJbTZWGgW7C//vfwWFm9yYI0LfErVZX3hEb 1NmHt9eIZJTRjFotWhMmUgKGLAQk36OIKEHwhqd9nXrf7AUMGQ6UTxyzITTUdpsVJfLH vMrrFclAt0bfxB+38aeKaDhcHbdcr5kNIoJtMS49jcWm/9JSOjxkr8bslrcUgdjxbzLF aSlg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Hlsv2Lx5; 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 j15-20020a0ce00f000000b0056eb790b4a9si8994218qvk.539.2023.02.28.11.10.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:10:32 -0800 (PST) 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=Hlsv2Lx5; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5KR-0002gG-Rv; Tue, 28 Feb 2023 14:08:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Jp-0002Ld-N6 for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:24 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Jj-0002s2-QF for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:07:20 -0500 Received: by mail-wr1-x42b.google.com with SMTP id t15so10872181wrz.7 for ; Tue, 28 Feb 2023 11:07:03 -0800 (PST) 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 :message-id:reply-to; bh=NV5c9ZkKt6Q2cnLXaD8Zu/a6gkE2KjhBbGJKeHd9aTc=; b=Hlsv2Lx55ICMOfeJMfDOq2udjhk0La+lGZAhR6gcjiI6E0ZRkBF95kVMYJ5roz3Gc7 J9nZs/wGRx9+ttjIX7zEkrWyRFPQBdFU4MROMH1+Do9N9VfS/BSFeFONxKN7t8SzFIni s1u0g6jgVXFx1zEHL/UjZvMZH3xxoUhQ6UJ+aK3F8m3Mz96CY5D5co7cT75cEAxI0Ihx K3pMIqQgkBv9hIM/Inv+u+YFYPcjAvafhJ1eHhbDkLy5NvkIyopIz8Jlu8Pdrn7BYFuB fP0NSnDke0GHyRqyNAO/dLe3LkFXjQinCmbCzH2BbmKvyXUu8UhhxFDXj/l9BCw0oyFm V1kA== 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:message-id:reply-to; bh=NV5c9ZkKt6Q2cnLXaD8Zu/a6gkE2KjhBbGJKeHd9aTc=; b=SXriQDa5Gyy7x8CD4vCEVJ1mdoOR1aaLX/IcfEe5iaGvkcwRGqFU7JM7OWz5I5Hf43 eYVjlSTgxow6aU3cMSFPY/Al/N3huXNcc+HCVoeisE95KX3xZOoYkVaSwEMl020JhHIl jKv8LH8a8owXNoLkVjeU+QVghq5M5C/79BRV/q0LvM7+lIUybsc2upbCq8Fw0odRYAPy cBIplhSmBBJvekTFYahcdWhMfgwBRP3uNMNhwUluzKeqcEdgOXDhqxwaLZioL0Y0zrt7 2BMkFrCk1NN5urAbAxtRX2vKWrzMeko6uO1IUK8MRfg8UOuZtK/k1ClUknUcHZtt6MiI LtcA== X-Gm-Message-State: AO0yUKVXRFpg7PxWm+xW8cPmMc/U1VWaxNTZd+13nRCuSo8FZW2Fd65H AinXNgCX2hMQBBOXezHMkddtmA== X-Received: by 2002:adf:dc50:0:b0:2c5:8c04:efbf with SMTP id m16-20020adfdc50000000b002c58c04efbfmr3096082wrj.13.1677611222618; Tue, 28 Feb 2023 11:07:02 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id w15-20020adfee4f000000b002be5bdbe40csm10497878wro.27.2023.02.28.11.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:07:01 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CD2E81FFC7; Tue, 28 Feb 2023 19:06:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 19/24] tests/docker: add USER stanzas to non-lci images Date: Tue, 28 Feb 2023 19:06:48 +0000 Message-Id: <20230228190653.1602033-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42b; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org These are flat but not generated by lcitool so we need to manually update them with the `useradd` stanza. Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/debian-all-test-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-alpha-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-hexagon-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-hppa-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-loongarch-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-m68k-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-mips-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-mips64-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-native.docker | 5 +++++ tests/docker/dockerfiles/debian-powerpc-test-cross.docker | 6 +++++- tests/docker/dockerfiles/debian-riscv64-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-riscv64-test-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-sh4-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-sparc64-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-toolchain.docker | 5 +++++ tests/docker/dockerfiles/debian-tricore-cross.docker | 5 +++++ tests/docker/dockerfiles/debian-xtensa-cross.docker | 5 +++++ tests/docker/dockerfiles/fedora-cris-cross.docker | 5 +++++ tests/docker/dockerfiles/fedora-i386-cross.docker | 5 +++++ tests/docker/dockerfiles/python.docker | 5 +++++ 20 files changed, 100 insertions(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 8dc5e1b5de..981e9bdc7b 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -61,3 +61,8 @@ RUN DEBIAN_FRONTEND=noninteractive eatmydata \ ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools ENV DEF_TARGET_LIST aarch64-linux-user,alpha-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sh4-linux-user,sparc64-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker index 4eeb43c78a..7fa7bf1bde 100644 --- a/tests/docker/dockerfiles/debian-alpha-cross.docker +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-alpha-linux-gnu \ libc6.1-dev-alpha-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-hexagon-cross.docker b/tests/docker/dockerfiles/debian-hexagon-cross.docker index 8a0d748343..5308ccb8fe 100644 --- a/tests/docker/dockerfiles/debian-hexagon-cross.docker +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker @@ -33,3 +33,8 @@ ENV TOOLCHAIN_URL https://codelinaro.jfrog.io/artifactory/codelinaro-toolchain-f RUN curl -#SL "$TOOLCHAIN_URL" | tar -xJC "$TOOLCHAIN_INSTALL" ENV PATH $PATH:${TOOLCHAIN_INSTALL}/${TOOLCHAIN_BASENAME}/x86_64-linux-gnu/bin +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-hppa-cross.docker b/tests/docker/dockerfiles/debian-hppa-cross.docker index af1c8403d8..dd47ffdfa4 100644 --- a/tests/docker/dockerfiles/debian-hppa-cross.docker +++ b/tests/docker/dockerfiles/debian-hppa-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-hppa-linux-gnu \ libc6-dev-hppa-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-loongarch-cross.docker b/tests/docker/dockerfiles/debian-loongarch-cross.docker index a8e8e98909..9d957547b5 100644 --- a/tests/docker/dockerfiles/debian-loongarch-cross.docker +++ b/tests/docker/dockerfiles/debian-loongarch-cross.docker @@ -25,3 +25,8 @@ RUN curl -#SL https://github.com/loongson/build-tools/releases/download/2022.05. ENV PATH $PATH:/opt/cross-tools/bin ENV LD_LIBRARY_PATH /opt/cross-tools/lib:/opt/cross-tools/loongarch64-unknown-linux-gnu/lib:$LD_LIBRARY_PATH +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-m68k-cross.docker b/tests/docker/dockerfiles/debian-m68k-cross.docker index dded71c5d2..25dd1c1e68 100644 --- a/tests/docker/dockerfiles/debian-m68k-cross.docker +++ b/tests/docker/dockerfiles/debian-m68k-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-m68k-linux-gnu \ libc6-dev-m68k-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-mips-cross.docker b/tests/docker/dockerfiles/debian-mips-cross.docker index 7b55f0f3b2..2cbc568ed1 100644 --- a/tests/docker/dockerfiles/debian-mips-cross.docker +++ b/tests/docker/dockerfiles/debian-mips-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-mips-linux-gnu \ libc6-dev-mips-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker index afcff9726f..ba965cf564 100644 --- a/tests/docker/dockerfiles/debian-mips64-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-mips64-linux-gnuabi64 \ libc6-dev-mips64-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-native.docker b/tests/docker/dockerfiles/debian-native.docker index 8dd033097c..abac7d7cd7 100644 --- a/tests/docker/dockerfiles/debian-native.docker +++ b/tests/docker/dockerfiles/debian-native.docker @@ -47,3 +47,8 @@ RUN apt update && \ ENV QEMU_CONFIGURE_OPTS $QEMU_CONFIGURE_OPTS ENV DEF_TARGET_LIST "none" +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker index d6b2909cc4..23779413d3 100644 --- a/tests/docker/dockerfiles/debian-powerpc-test-cross.docker +++ b/tests/docker/dockerfiles/debian-powerpc-test-cross.docker @@ -16,4 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libc6-dev-ppc64-cross \ gcc-10-powerpc64le-linux-gnu \ libc6-dev-ppc64el-cross - +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 3daf93968a..803afb9573 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -50,3 +50,8 @@ RUN apt update && \ # Specify the cross prefix for this image (see tests/docker/common.rc) ENV QEMU_CONFIGURE_OPTS --cross-prefix=riscv64-linux-gnu- ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker index e5f83a5aeb..6e631295bc 100644 --- a/tests/docker/dockerfiles/debian-riscv64-test-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-test-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-riscv64-linux-gnu \ libc6-dev-riscv64-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-sh4-cross.docker b/tests/docker/dockerfiles/debian-sh4-cross.docker index d48ed9065f..6bd8171d33 100644 --- a/tests/docker/dockerfiles/debian-sh4-cross.docker +++ b/tests/docker/dockerfiles/debian-sh4-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-sh4-linux-gnu \ libc6-dev-sh4-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-sparc64-cross.docker b/tests/docker/dockerfiles/debian-sparc64-cross.docker index 8d3d306bc1..1ef735f223 100644 --- a/tests/docker/dockerfiles/debian-sparc64-cross.docker +++ b/tests/docker/dockerfiles/debian-sparc64-cross.docker @@ -12,3 +12,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ eatmydata apt-get install --no-install-recommends -y \ gcc-sparc64-linux-gnu \ libc6-dev-sparc64-cross +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-toolchain.docker b/tests/docker/dockerfiles/debian-toolchain.docker index dc9545857f..687a97fec4 100644 --- a/tests/docker/dockerfiles/debian-toolchain.docker +++ b/tests/docker/dockerfiles/debian-toolchain.docker @@ -34,3 +34,8 @@ RUN cd /root && ./build-toolchain.sh # then copying the built toolchain from stage 0. FROM docker.io/library/debian:11-slim COPY --from=0 /usr/local /usr/local +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/docker/dockerfiles/debian-tricore-cross.docker index 82e4576485..cfd2faf9a8 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -41,3 +41,8 @@ RUN curl -#SL https://github.com/bkoppelmann/package_940/releases/download/trico # This image can only build a very minimal QEMU as well as the tests ENV DEF_TARGET_LIST tricore-softmmu ENV QEMU_CONFIGURE_OPTS --disable-user --disable-tools --disable-fdt +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker index 2f11b3b7bc..082b50da19 100644 --- a/tests/docker/dockerfiles/debian-xtensa-cross.docker +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -27,3 +27,8 @@ RUN for cpu in $CPU_LIST; do \ done ENV PATH $PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-de233_fpu-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dsp3400-elf/bin +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/docker/dockerfiles/fedora-cris-cross.docker index 91c373fdd3..f2899af410 100644 --- a/tests/docker/dockerfiles/fedora-cris-cross.docker +++ b/tests/docker/dockerfiles/fedora-cris-cross.docker @@ -6,3 +6,8 @@ FROM registry.fedoraproject.org/fedora:33 ENV PACKAGES gcc-cris-linux-gnu RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker index f58b64dc3e..14c1fb2c93 100644 --- a/tests/docker/dockerfiles/fedora-i386-cross.docker +++ b/tests/docker/dockerfiles/fedora-i386-cross.docker @@ -32,3 +32,8 @@ ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig RUN dnf update -y && dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi diff --git a/tests/docker/dockerfiles/python.docker b/tests/docker/dockerfiles/python.docker index 175c10a34e..383ccbdc3a 100644 --- a/tests/docker/dockerfiles/python.docker +++ b/tests/docker/dockerfiles/python.docker @@ -15,3 +15,8 @@ ENV PACKAGES \ RUN dnf install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt +# As a final step configure the user (if env is defined) +ARG USER +ARG UID +RUN if [ "${USER}" ]; then \ + id ${USER} 2>/dev/null || useradd -u ${UID} -U ${USER}; fi From patchwork Tue Feb 28 19:06:49 2023 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: 657491 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3099755wrb; Tue, 28 Feb 2023 11:15:01 -0800 (PST) X-Google-Smtp-Source: AK7set8OYmasoVV6JzyEJzuc5tKu6rZtjIKGPmomzIANUPKZwJsVn3NnfrLhZWAeQ3SuYCBnnYEm X-Received: by 2002:a05:622a:1391:b0:3bf:c7ac:37e4 with SMTP id o17-20020a05622a139100b003bfc7ac37e4mr6454489qtk.53.1677611701474; Tue, 28 Feb 2023 11:15:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611701; cv=none; d=google.com; s=arc-20160816; b=EjQpLxz4zt6vMzznN8LzvQ7Oggt87e3WXfDF/Gc0459KU7B6sKTZqOZBMEYycudfSJ lBz8giS18s4r1VghmrqecXwwQ70osSiJGJ+4vcahX/5/17EalsXI6SUpc9CNRvHTcXC5 i6eG8/T3MdTJW910Q9dnwUwXHz+eV/Qs4n6MaLa6UUkMBelOOvB6FY8zGtAXQM8YH/ga JTegnHU42+8oFrlBb2VQ0dm63OkZFnufx8fIXNPZHhRd986kjotRXJ3CAVO2Pz0Z0te0 W0hLFdLQ5+SeFxsxfuL94zR8sANpuWy1e5NCYpVG7ivxgkrzKwK2CS+mL38lQMaJTHQ3 Xe3w== 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=G+62htoyJBiemmn6ddrMZ4MlyjuyTr1hSFkUI1vjiwM=; b=EjFEjysEvPLIppUOB61xVcrVuI6cIVtxaorQ8qg0ToFcLslSVGHb/lQF01dP03LRBn oDw1iAjIvGK+owN2GtfXPM7pujS3a7cKS9kgd78ZhIQr+eawkIrXGdYphwDhnZ0j8Qny Elt+c4NiHwumREgJUrZtuVi6b5rs1TXcXm8CF0xps/kJHAEhHwNaAzAGMTlAwpWmCXXY 0Zcnk2HIzCB38SI1taUk6bXEu4jT5lPU9K/d5+WMbj/XW/6Z0N8w0QVeUSV7GXbS2Kvu 1zWKqFtR/xhuN9sPrfRdOUZwz8IVyE6Wo4ppWHh4uprjmZ2RdsTKRpr6M3hmsRt+6Kgj b81A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=uatG3MWn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id q18-20020a05622a031200b003b88d38365fsi9065730qtw.394.2023.02.28.11.15.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:15:01 -0800 (PST) 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=uatG3MWn; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5Qo-0000Ph-Rs; Tue, 28 Feb 2023 14:14:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Ql-0000Oe-LO for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:14:32 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Qh-0004fK-3Z for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:14:31 -0500 Received: by mail-wr1-x42f.google.com with SMTP id bx12so7735524wrb.11 for ; Tue, 28 Feb 2023 11:14:25 -0800 (PST) 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 :message-id:reply-to; bh=G+62htoyJBiemmn6ddrMZ4MlyjuyTr1hSFkUI1vjiwM=; b=uatG3MWnZRdbIrX0cqJ4BCnWZbXF7zlO2EB9P77CISfzckCtyQxVJWeKZPHsb4LW55 zt/nt6XjlJ0MzBOkeUliw9LGUqgnX1bObW6RqnpHfA4oDMxNj4fzx8gGx8BlyWHC/EUa 1hTN8fWROC7YIH76pLtmVN8w3O1SB2dlew97q9+kh3nDk5EFI6h4PU8a6X3nSx9waaqm icSfNv/zGndvE4zi7IzgDXffmJYpZjxaR6q0hp3qHGnKBEeVGhNKkfYHOMP0OX+YUzA/ TvULyJhEXNcGXdnme9FvO+LadFQa3mMZDrDvjinv66qsZdt7opWL258IkLFdOWOmHjEq JLzg== 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:message-id:reply-to; bh=G+62htoyJBiemmn6ddrMZ4MlyjuyTr1hSFkUI1vjiwM=; b=SnHRdASskMwOHKk+2NuhluBAcO4q3IOrfgRpaKjxXVZct8WeMmy1DsM8UYLZHhs0Zf VAKGGJFdHzmLoS9PpAf+8eR9DqgUoVjw/o8LwlZ4Kwp1HJP/eOebhS9rrm9WjxJQSwdR pGF/gOtUlRMzBJNz8V7RdvmaYQYMapH8w6ooVPQ2b74qCHCqvAXNJXztPuh8O8KC+DCU 1DzLioPiF157jcbvdN0JAaJrMVd5WpLYcWyHTaqKNb84g35Zktbfl0/dvSf5auaeda8x zWZYeq5LGEL4nU+j9PgvkTk7lRYosIxalWlYpXCIROGm3kd6e/UNxKdW+jBcugRlyguk p0Og== X-Gm-Message-State: AO0yUKWIv5bWBGEKtR8HR1Kg4wlhOP/XfzChl0lLf4MRNnxB4dUmraXR En/FSagOf41R7SKpWdF7dHv7Yg== X-Received: by 2002:a5d:6ac4:0:b0:2c7:1d70:561 with SMTP id u4-20020a5d6ac4000000b002c71d700561mr2816919wrw.45.1677611661633; Tue, 28 Feb 2023 11:14:21 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c470700b003eb3933ef10sm11889776wmo.46.2023.02.28.11.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:14:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E61A51FFBC; Tue, 28 Feb 2023 19:06:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 20/24] tests/docker: use direct RUNC call to build containers Date: Tue, 28 Feb 2023 19:06:49 +0000 Message-Id: <20230228190653.1602033-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org We don't really need stuff from docker.py to do the build as we have everything we need with a direct call. We do rely on the dockerfiles being able to tweak the UID/name mapping as the last step. Reviewed-by: Daniel P. Berrangé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index bfb0dcac21..680afff952 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -7,6 +7,8 @@ SPACE := $(NULL) # COMMA := , HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m)) +USER = $(if $(NOUSER),,$(shell id -un)) +UID = $(if $(NOUSER),,$(shell id -u)) DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles ifeq ($(HOST_ARCH),x86_64) @@ -14,6 +16,7 @@ DOCKER_DEFAULT_REGISTRY := registry.gitlab.com/qemu-project/qemu endif DOCKER_REGISTRY := $(if $(REGISTRY),$(REGISTRY),$(DOCKER_DEFAULT_REGISTRY)) +RUNC ?= docker ENGINE ?= auto DOCKER_SCRIPT=$(SRC_PATH)/tests/docker/docker.py --engine $(ENGINE) @@ -35,15 +38,17 @@ docker-qemu-src: $(DOCKER_SRC_COPY) # General rule for building docker images. docker-image-%: $(DOCKER_FILES_DIR)/%.docker - $(call quiet-command,\ - $(DOCKER_SCRIPT) build -t qemu/$* -f $< \ - $(if $V,,--quiet) \ - $(if $(NOCACHE),--no-cache, \ - $(if $(DOCKER_REGISTRY),--registry $(DOCKER_REGISTRY))) \ - $(if $(NOUSER),,--add-current-user) \ - $(if $(EXTRA_FILES),--extra-files $(EXTRA_FILES))\ - $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ - "BUILD","$*") + $(call quiet-command, \ + $(RUNC) build \ + $(if $V,,--quiet) \ + $(if $(NOCACHE),--no-cache, \ + $(if $(DOCKER_REGISTRY),--cache-from $(DOCKER_REGISTRY)/qemu/$*)) \ + --build-arg BUILDKIT_INLINE_CACHE=1 \ + $(if $(NOUSER),, \ + --build-arg USER=$(USER) \ + --build-arg UID=$(UID)) \ + -t qemu/$* - < $<, \ + "BUILD", $1) # Special rule for debootstraped binfmt linux-user images docker-binfmt-image-debian-%: $(DOCKER_FILES_DIR)/debian-bootstrap.docker From patchwork Tue Feb 28 19:06:50 2023 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: 657492 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3100046wrb; Tue, 28 Feb 2023 11:15:44 -0800 (PST) X-Google-Smtp-Source: AK7set/BMQe0ee2YI2wxBGGEFT+oUI7lxHk0WTh207TaHm9fZYKgSxwF1qy5YZBb9yHaBAXr5CZt X-Received: by 2002:ad4:5e8d:0:b0:571:f87:a665 with SMTP id jl13-20020ad45e8d000000b005710f87a665mr8115040qvb.35.1677611744432; Tue, 28 Feb 2023 11:15:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611744; cv=none; d=google.com; s=arc-20160816; b=PSSjEAIDo9EhfbKn8bXuR2SkNLkjcdDzJtBQJAq3qRb84B3ncseLgK/9mgq8C2NNoS jwbJrGYQbHaqqEdUc/XWbvMtDy9UccaRq7j+8uluI8DO4Zy8V7/STkPumx7i1JBfoMdv bmlQfx2fIkqtW7tEUk14rFlhTRESiCEdJw8xs6ciD80Snq5H8cQAuYf8fVmuurxLcmit fcNH+XqNv0IXI0ggdBbqA2uK7/m1HDd3MOkz1RtUiieJrq7rcav9QIHN27qeaxAPXWyp +Z2syDMHOb0uwzRoXtwbkxHczJer6hK78K2/Oxjz0HGDiyuxi5yOUM0ydvNhzJf294WE PBpg== 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=f5HeGCTtnDvYK2JOBc+Ar5DGwIfM59biXTeTnbWUumM=; b=ZX/aSkg0LbimcypPlws6p//Hqv6vN/nGg9OZoWUoSNTBN6DL48F9WCZ7hPs15ZQh/e 00SqAY/Lhcu31Kiku3vv91m69afLZqyRCi9cCuxShUudVa+1KpdA6pUF47V0A6a/dEDv 4m9ia/kPrp1S+dzU1tQEgsHGkqDxY4JfTYJVqYW+U+s4PYwIYZqsd+JaXvPnsiHrwl1i g57Pky0xDH5n4w2KTM0NR+oEK6ZZFYvvb17mS4RdnXDni3sXcCZTiMUai6P0GNI5AOSn 1/l5z/B9p1pvtk5r7luxX2xVuIpzCPThPJ2kOpdDZfkN48J3BF72Ru6jIeAZhg4rhbRv 4ZPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cimG1UhT; 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 m7-20020a05620a24c700b00742a093dd9dsi7791276qkn.727.2023.02.28.11.15.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:15:44 -0800 (PST) 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=cimG1UhT; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5Qp-0000Pv-74; Tue, 28 Feb 2023 14:14:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Qo-0000PB-DG for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:14:34 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Qg-0004fN-DX for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:14:34 -0500 Received: by mail-wr1-x42f.google.com with SMTP id r18so10913285wrx.1 for ; Tue, 28 Feb 2023 11:14:25 -0800 (PST) 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 :message-id:reply-to; bh=f5HeGCTtnDvYK2JOBc+Ar5DGwIfM59biXTeTnbWUumM=; b=cimG1UhTHHogOciz41WjK9qI22rkt8VBW0FU5zqgDzNzOj6NxZBP7s0p1+p9yHetGw YjCcwxmCEhdWXO+rjbmEH+V4jW/ITK6M1Va+7+I1SLlZuQE+bmBvdzVkY6f61/nx04Cb 6Fmz/f9zzGFTxqkXSz26jsZpW+WCJFJJnOf+8DRiZsiVpZ7HGR8oPdCatE75h+4SDkdS GeCv1y3MHwoWP8hP9z1fG8tUAP6/yp/j2r4v40G2e6qrYDkUQARivJ5bsjViTP/SVudR NNpzrNf3ilHLIfutvMIqaA0eyPG+Gv9OHUgLSAq72yL6/4vJ1rXT1FazOJb3uWkmYf9y kdXw== 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:message-id:reply-to; bh=f5HeGCTtnDvYK2JOBc+Ar5DGwIfM59biXTeTnbWUumM=; b=OXxp0iQBFltj04KoxEl+eXvntFhy+qNxAyTRewHx8cCefHzWR2sfTnrX/Reqh4ZjVC 8Aen/7J0Cmfw2CsjvaZbLgBia4HortUQraH7e4S5sMyuq64lca5c7M59W+bm2l71cvul QkwO46GN2CHi9ykAfstMzvttv/H9ZtkuNnvLAe/5BUUqy65aCXWvTQyO3x1+cZTqK+Xo flI8Ku7g/gSUwcncKx2LmXkmIT1cqt4qSukOgajh/uy1wuHo9tTrJ9FSFR5qqNjlEXH0 QqXpTg04YCZvcw3OoQNBUg2OP/JIXhk+Ue/KQuLb8cuHZaq7OXSQT3xtD9jm1TUji5F0 uHRQ== X-Gm-Message-State: AO0yUKX3kSG05Hi6p4YnbKdNlkp5NiySwVT7SoSEiRsD7DBFuu6JTCOT LM5gI6oj5EkPe4I4HkDMNtYobA== X-Received: by 2002:adf:ce10:0:b0:2c7:e05:2d1b with SMTP id p16-20020adfce10000000b002c70e052d1bmr3172076wrn.50.1677611660904; Tue, 28 Feb 2023 11:14:20 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id v16-20020a5d4a50000000b002c5526234d2sm10694219wrs.8.2023.02.28.11.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:14:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 0A4101FFC8; Tue, 28 Feb 2023 19:06:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 21/24] tests/docker: use direct RUNC call to run test jobs Date: Tue, 28 Feb 2023 19:06:50 +0000 Message-Id: <20230228190653.1602033-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org If we build them without the script we can certainly run them without it. Reviewed-by: Daniel P. Berrangé Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 680afff952..54ed77f671 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -224,8 +224,9 @@ docker-run: docker-qemu-src $(IMAGE) --executable $(EXECUTABLE), \ " COPYING $(EXECUTABLE) to $(IMAGE)")) $(call quiet-command, \ - $(DOCKER_SCRIPT) run \ - $(if $(NOUSER),,--run-as-current-user) \ + $(RUNC) run \ + --rm \ + $(if $(NOUSER),,-u $(UID)) \ --security-opt seccomp=unconfined \ $(if $(DEBUG),-ti,) \ $(if $(NETWORK),$(if $(subst $(NETWORK),,1),--net=$(NETWORK)),--net=none) \ From patchwork Tue Feb 28 19:06:51 2023 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: 657497 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3102650wrb; Tue, 28 Feb 2023 11:21:24 -0800 (PST) X-Google-Smtp-Source: AK7set8ymzGVxUij+3ANqqUxt5Ts3bhLnL+EcWY7JJN2/ghz3E6DTa4qbyAJPsLPSBA4Yi9Zm2lU X-Received: by 2002:a05:6214:2b0f:b0:56e:f4e0:a4e9 with SMTP id jx15-20020a0562142b0f00b0056ef4e0a4e9mr8174743qvb.29.1677612084699; Tue, 28 Feb 2023 11:21:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677612084; cv=none; d=google.com; s=arc-20160816; b=t0rV5s9BF/2CZXK/NjIekYjibItmrAdJ0U1JcrhoIljiMY+5rJwlsN0ONq6/w46v5y m7JV0+8YyEZC5wzFvxLQpBU2TrYGjgY3LPlw8EMGy8HCVk6cD7316/IzW/c7PxB4DpY3 63xXk2kOJ5G287MIkj+Kg2BKDY0UERRF1g1NQnRcRXgZus03EFEe4svwqTdIMTtyy1dP sdK5tqk2yn9YnLM0Fc8mfeINdEDPq1UB7neC+auiMeV2DImKh95x95c1iy3aJlbO3fph tz4sOMcNppVu8uOK3mRU8JLer4U7x7t+2QQ1MiFjoQXaRZamXjMQvRzkeeJ1wYtNRhIW XwwQ== 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=zjfLbbeWo1zRN8aNmhtafD+qUQTe9TytE2JRGCWnF7o=; b=CreMEE48qgn1qGXWxZA6oVtpk2M/A3ndMq7RDBYIbv7Gq/iuoASchM1GYSSjA+wbPP FM6LE5cyPmw6/J1SVGZB43/2UMkhLrANTQXWq/cH+o5ViZF7a5VaYM4aAyNOpCb5FfHT JSbH7Ez6nLXIann9yZbkIlxEOKpG8jqQPc1YytP3u/Mnb5NDQTvzDZtCjIPhITwJ+uJU Cg7zN5AWJ68WO18UuLG3P4T4WpWAs4qvsKcr6LpA0gqGqFCHpmI0VVPNr3StKOlxWRrz /tUoXYrhnMeP3LKtFPBB8khzrBc9sQMo502XMbMQz5ls/26M4Ed9dvmWQlgsxArWeJn6 6VFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DL6ivUit; 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 m19-20020a0cf193000000b00531bf7ba94dsi9195591qvl.461.2023.02.28.11.21.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:21:24 -0800 (PST) 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=DL6ivUit; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5X9-0007fd-6P; Tue, 28 Feb 2023 14:21:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5X7-0007as-2o for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:21:05 -0500 Received: from mail-lj1-x22e.google.com ([2a00:1450:4864:20::22e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5X5-00068o-29 for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:21:04 -0500 Received: by mail-lj1-x22e.google.com with SMTP id by8so11430732ljb.7 for ; Tue, 28 Feb 2023 11:21:02 -0800 (PST) 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 :message-id:reply-to; bh=zjfLbbeWo1zRN8aNmhtafD+qUQTe9TytE2JRGCWnF7o=; b=DL6ivUit2IrH5OAEzagTY4OxPP6moKy93Bs8Z8xWKoMxE8GoNJeddSepbG5NrZ4xyn OhY81QXBgAD+A81ydRHmvcBUm5gmAR597XLF4M7JXRPrrYzyiDb0LpfV8i9kMN7dL0mh ktS0I4lFiIpekVg2uw1azH+yt6zlBPNcvlCRuz1NSGF1V9I9IqCSwuCEz96n6iWZrpEH KbX8UlnJ9yld9TgIN8q5d25o3uVVPHp6wGNCoD3ja7eyxRe0JmQJH2NEw97nUdUD/uFW l1VXPC1p3mU+fk89Yfc9EepgSEl2DNM/9paEXypgqD9R9zNCrnSkGPNVQmw1xzqfzLd3 fYaA== 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:message-id:reply-to; bh=zjfLbbeWo1zRN8aNmhtafD+qUQTe9TytE2JRGCWnF7o=; b=V06kCFmUEIv+KsX/E3RRF9UeUNlk2QbOR0OCz72ykaYHCikwUKQbBPsEdXuBjmJdi+ JPTPd1dMkDyYLz13OsJA855I7F1rQiOM26UFl/K4/zMpuTBPkOoii8Sg3xeztBMspzzF +Q0RrjxtPD+jM3At+qvD9CDKAN+tZIAJ4L05bn4+p4GBRlchcJxTnATAxwQjIeKt+7Vq 5uSWbaDcXajORel6rB8eGqTaOciowu75y3IgZFOsBS7PWB+TvKxzJaJ7GCZVHPTiHtyD AK/Ja7zfqDIPIvvUWxNU2qbPXA6d3iQ0piPVdG00gL37Ms996iLJ63fhTTmEhzlh5Vbf MKmA== X-Gm-Message-State: AO0yUKX7FOaUBqtoWISiv0qY96TyqQ2AsoFW48ctfjPJT2mmKfEqcMSw zvLOBw0ntzyBMP9bo87VYCG/X6XXgM/JhMQe X-Received: by 2002:a05:600c:3296:b0:3ea:e582:48dd with SMTP id t22-20020a05600c329600b003eae58248ddmr3057294wmp.34.1677611663440; Tue, 28 Feb 2023 11:14:23 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id t3-20020a5d6903000000b002c56af32e8csm10765603wru.35.2023.02.28.11.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:14:22 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 257451FFC9; Tue, 28 Feb 2023 19:06:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 22/24] gitlab: move the majority of artefact handling to a template Date: Tue, 28 Feb 2023 19:06:51 +0000 Message-Id: <20230228190653.1602033-23-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22e; envelope-from=alex.bennee@linaro.org; helo=mail-lj1-x22e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org To avoid lots of copy and paste lets deal with artefacts in a template. This way we can filter out most of the pre-binary object and library files we no longer need as we have the final binaries. build-system-alpine also saved .git-submodule-status so for simplicity we bring that into the template as well. As an example the build-system-ubuntu artefacts before this patch where around 1.3 GB, after dropping the object files it comes to 970 MB. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé --- .gitlab-ci.d/buildtest-template.yml | 16 ++++++ .gitlab-ci.d/buildtest.yml | 81 +++++++++++------------------ 2 files changed, 46 insertions(+), 51 deletions(-) diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index cb96b55c3f..a6cfe9be97 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -25,6 +25,22 @@ make -j"$JOBS" $MAKE_CHECK_ARGS ; fi +# We jump some hoops in common_test_job_template to avoid +# rebuilding all the object files we skip in the artifacts +.native_build_artifact_template: + artifacts: + expire_in: 2 days + paths: + - build + - .git-submodule-status + exclude: + - build/**/*.p + - build/**/*.a.p + - build/**/*.fa.p + - build/**/*.c.o + - build/**/*.c.o.d + - build/**/*.fa + .common_test_job_template: extends: .base_job_template stage: test diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 43f9e4a81d..44b8275299 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -2,7 +2,9 @@ include: - local: '/.gitlab-ci.d/buildtest-template.yml' build-system-alpine: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: - job: amd64-alpine-container variables: @@ -11,11 +13,6 @@ build-system-alpine: microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build CONFIGURE_ARGS: --enable-docs --enable-trace-backends=log,simple,syslog - artifacts: - expire_in: 2 days - paths: - - .git-submodule-status - - build check-system-alpine: extends: .native_test_job_template @@ -36,7 +33,9 @@ avocado-system-alpine: MAKE_CHECK_ARGS: check-avocado build-system-ubuntu: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-ubuntu2204-container variables: @@ -45,10 +44,6 @@ build-system-ubuntu: TARGETS: alpha-softmmu cris-softmmu hppa-softmmu microblazeel-softmmu mips64el-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-ubuntu: extends: .native_test_job_template @@ -69,7 +64,9 @@ avocado-system-ubuntu: MAKE_CHECK_ARGS: check-avocado build-system-debian: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-debian-container variables: @@ -78,10 +75,6 @@ build-system-debian: TARGETS: arm-softmmu avr-softmmu i386-softmmu mipsel-softmmu riscv64-softmmu sh4eb-softmmu sparc-softmmu xtensaeb-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-debian: extends: .native_test_job_template @@ -114,7 +107,9 @@ crash-test-debian: - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-i386 build-system-fedora: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-fedora-container variables: @@ -123,10 +118,6 @@ build-system-fedora: TARGETS: tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-fedora: extends: .native_test_job_template @@ -160,7 +151,9 @@ crash-test-fedora: - tests/venv/bin/python3 scripts/device-crash-test -q ./qemu-system-riscv32 build-system-centos: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-centos8-container variables: @@ -170,10 +163,6 @@ build-system-centos: TARGETS: ppc64-softmmu or1k-softmmu s390x-softmmu x86_64-softmmu rx-softmmu sh4-softmmu nios2-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-centos: extends: .native_test_job_template @@ -194,17 +183,15 @@ avocado-system-centos: MAKE_CHECK_ARGS: check-avocado build-system-opensuse: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-opensuse-leap-container variables: IMAGE: opensuse-leap TARGETS: s390x-softmmu x86_64-softmmu aarch64-softmmu MAKE_CHECK_ARGS: check-build - artifacts: - expire_in: 2 days - paths: - - build check-system-opensuse: extends: .native_test_job_template @@ -339,7 +326,9 @@ clang-user: # Split in three sets of build/check/avocado to limit the execution time of each # job build-cfi-aarch64: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: - job: amd64-fedora-container variables: @@ -355,10 +344,6 @@ build-cfi-aarch64: # skipped until the situation has been solved. QEMU_JOB_SKIPPED: 1 timeout: 90m - artifacts: - expire_in: 2 days - paths: - - build check-cfi-aarch64: extends: .native_test_job_template @@ -379,7 +364,9 @@ avocado-cfi-aarch64: MAKE_CHECK_ARGS: check-avocado build-cfi-ppc64-s390x: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: - job: amd64-fedora-container variables: @@ -395,10 +382,6 @@ build-cfi-ppc64-s390x: # skipped until the situation has been solved. QEMU_JOB_SKIPPED: 1 timeout: 80m - artifacts: - expire_in: 2 days - paths: - - build check-cfi-ppc64-s390x: extends: .native_test_job_template @@ -419,7 +402,9 @@ avocado-cfi-ppc64-s390x: MAKE_CHECK_ARGS: check-avocado build-cfi-x86_64: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: - job: amd64-fedora-container variables: @@ -431,10 +416,6 @@ build-cfi-x86_64: TARGETS: x86_64-softmmu MAKE_CHECK_ARGS: check-build timeout: 70m - artifacts: - expire_in: 2 days - paths: - - build check-cfi-x86_64: extends: .native_test_job_template @@ -564,7 +545,9 @@ build-libvhost-user: # No targets are built here, just tools, docs, and unit tests. This # also feeds into the eventual documentation deployment steps later build-tools-and-docs-debian: - extends: .native_build_job_template + extends: + - .native_build_job_template + - .native_build_artifact_template needs: job: amd64-debian-container # when running on 'master' we use pre-existing container @@ -574,10 +557,6 @@ build-tools-and-docs-debian: MAKE_CHECK_ARGS: check-unit ctags TAGS cscope CONFIGURE_ARGS: --disable-system --disable-user --enable-docs --enable-tools QEMU_JOB_PUBLISH: 1 - artifacts: - expire_in: 2 days - paths: - - build # Prepare for GitLab pages deployment. Anything copied into the # "public" directory will be deployed to $USER.gitlab.io/$PROJECT From patchwork Tue Feb 28 19:06:52 2023 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: 657493 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3100044wrb; Tue, 28 Feb 2023 11:15:44 -0800 (PST) X-Google-Smtp-Source: AK7set8tXDYOr/GIKVbnCEjTH5k3vC9x9oG8fAvzuIqqjje7v8E0Xv/OcR0zPSc3qdsqwhkkYYTK X-Received: by 2002:ac8:5790:0:b0:3bf:cfdd:7037 with SMTP id v16-20020ac85790000000b003bfcfdd7037mr6629753qta.18.1677611744351; Tue, 28 Feb 2023 11:15:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611744; cv=none; d=google.com; s=arc-20160816; b=mv8E9qCgOdTsTTqKtzXzbFP3RACb3bgMD7hPM2OivSk1lNpSJDd2x0M4L7ZjQCSpri +0dgHuK59YCRt7SY8+/iOKh/hh2jMF6OHo73bL1E4ZNG5OTkgNHLrOPe0yW1ARdDLyIU H2cBR8vfNwmqIExa4KgWBkXOR12fda/2OfNnarPGzUe4DyXRVhS9kzerDyKafO88xNLv VsMn2C84d8PDspvP9JslfUNBV0rCbaWK5Q5Rcw+V2KNRI2wRjjD3Sr7lMqoluye01+cg MAH0PkuwaWJUoLad1KoowDFlBDY8tGOkb5fkmur4G7lbgbl52kZNULwgQIwNLQBU/qAQ J/8g== 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=o3hkesFlKYfo04krCxHeFIvJxHdQ5suzWYXG9ss+dCA=; b=0Bct+R+yv4lRxBgr36fLTcWYkuticZIDWn9REHsPuL+afkRVPidFYb5aXaHgOc4NJS /ppnDybJswrlaPJuMNGm93sa/NkfAqAZv0dFLvYkeRCfQSyL1ewwA05uE7DrKk4Sx7Ul IV7dQMJ1g/ddNKRZVHuRdF794bvLn+GDGO6fSGIUTlVD4Wot+DZ463uK3FkPAl3Pl/Hv tHV4Xd2iIFERxZlNV5/rys0FZcskCEXhk6nMiwOzyybyznBBMqlMA8PPKgjf5lcfkO0Y mJjDa03SgS8JmmWS6TrkGBkWBRtpDD3Kw5P/8Yy0JQjMxfsPpbbzN6bPeFyn7sSjduC2 ZhbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fuaspaN6; 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 f6-20020ac87f06000000b003a7efe36b36si8966428qtk.454.2023.02.28.11.15.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:15:44 -0800 (PST) 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=fuaspaN6; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5Qt-0000Rv-Gy; Tue, 28 Feb 2023 14:14:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Qs-0000RA-0d for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:14:38 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Qi-0004fT-DW for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:14:37 -0500 Received: by mail-wr1-x42e.google.com with SMTP id v16so8085368wrn.0 for ; Tue, 28 Feb 2023 11:14:26 -0800 (PST) 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 :message-id:reply-to; bh=o3hkesFlKYfo04krCxHeFIvJxHdQ5suzWYXG9ss+dCA=; b=fuaspaN6/PM/LxUwrU2/dy/xlSlAUvpVGsvx9MM/IhQRW29MpXBecAcrZtqGBzOsBl 5eBst+a99MMA8BukchG0ZUmfP+axXIg1a4U3p917TuTUqSahYFziMTVexQr+n2vezxW1 QBe3jKoUzDn+t34MWgUvI9wLkx59jmHNyfzAbwRSDWZn7MMMWfJnXOGsiAKBZaWFwmTu BMhXGDCMQ8I5QRPOXFvjlzelVXRaeIqW5KliXSdFLcfu+rON138LX910F7OaII6uZ3XV /nltRjrC2lP06w4MnB5CEz/OXg4aKGlXww/s7KAu09naTYapvdaG2oLOFOarrywurZaH gN3g== 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:message-id:reply-to; bh=o3hkesFlKYfo04krCxHeFIvJxHdQ5suzWYXG9ss+dCA=; b=kHR2PYCLC7TS0a0roPZ0T5xvQfk48KuX0U4qq8hoG4wkxOylaFgzmzcoqqDl+vIaI5 OmSK1nbRFpqUj8z+Jb00wp6MR3hlu3tVlMxeaHfc5iplRqTwK5SzzhewN3KyH4BjvwQ9 JOIP6OU10fa5MwU6YsuL71KXenhY9noW3VlGqBk7hCg586KEEOFrY5qfox5RN5S77rlP Dsjp103NLHCAgiVTIr7SF+wbhs9N/8g6ZIJ7TzDTAWIwVbCY68VkVEBv+L96II3Zp9+C +y0PRmj/auxRB7MIBa0zzL6gnCZcDlsuLEVcrr9GXRTzCjxE3nEj7yg75E3T1dsdFtCz gPqg== X-Gm-Message-State: AO0yUKWLiM0RHoRvhdQNvTpihB7c1CEdYI1Vg6jaHJJTo/Bjn1FAcrcQ U6DZjM9DEI/HncDSh8uraNd56A== X-Received: by 2002:a5d:4e8c:0:b0:2ca:8ae5:ea7 with SMTP id e12-20020a5d4e8c000000b002ca8ae50ea7mr3153503wru.32.1677611661942; Tue, 28 Feb 2023 11:14:21 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id d2-20020adfef82000000b002c5801aa9b0sm10744540wro.40.2023.02.28.11.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:14:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 679971FFCA; Tue, 28 Feb 2023 19:06:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 23/24] tests/docker: add zstdtools to the images (!AWAITING UPSTREAM) Date: Tue, 28 Feb 2023 19:06:52 +0000 Message-Id: <20230228190653.1602033-24-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org We need this to be able to run the tuxrun_baseline tests in CI which in turn helps us reduce overhead running other tests. [See https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/361] Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/docker/dockerfiles/alpine.docker | 1 + tests/docker/dockerfiles/centos8.docker | 3 ++- tests/docker/dockerfiles/debian-amd64-cross.docker | 3 ++- tests/docker/dockerfiles/debian-amd64.docker | 3 ++- tests/docker/dockerfiles/debian-arm64-cross.docker | 3 ++- tests/docker/dockerfiles/debian-armel-cross.docker | 3 ++- tests/docker/dockerfiles/debian-armhf-cross.docker | 3 ++- tests/docker/dockerfiles/debian-mips64el-cross.docker | 3 ++- tests/docker/dockerfiles/debian-mipsel-cross.docker | 3 ++- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 3 ++- tests/docker/dockerfiles/debian-s390x-cross.docker | 3 ++- tests/docker/dockerfiles/fedora-win32-cross.docker | 3 ++- tests/docker/dockerfiles/fedora-win64-cross.docker | 3 ++- tests/docker/dockerfiles/fedora.docker | 3 ++- tests/docker/dockerfiles/opensuse-leap.docker | 3 ++- tests/docker/dockerfiles/ubuntu2004.docker | 3 ++- tests/docker/dockerfiles/ubuntu2204.docker | 3 ++- tests/lcitool/projects/qemu.yml | 1 + 18 files changed, 34 insertions(+), 16 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker index 33e4823400..51f0957c67 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -110,6 +110,7 @@ RUN apk update && \ xfsprogs-dev \ zlib-dev \ zlib-static \ + zstd \ zstd-dev && \ apk list | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 28c5e7e43c..2a0ed397e8 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -118,7 +118,8 @@ RUN dnf distro-sync -y && \ which \ xfsprogs-devel \ zlib-devel \ - zlib-static && \ + zlib-static \ + zstd && \ dnf autoremove -y && \ dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 5d03b5c22d..afb1cbd046 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index febc46e700..28e2fa81b1 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -127,7 +127,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tesseract-ocr \ tesseract-ocr-eng \ xfslibs-dev \ - zlib1g-dev && \ + zlib1g-dev \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index b9501a21bc..b4f7a7f903 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/docker/dockerfiles/debian-armel-cross.docker index f21742ede5..4b4191f824 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index decdeda6f2..c9b6b2e563 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index 1df05fcf20..cfe4f9a0d7 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 019b8dcaff..8e521fc9ee 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 3ceab4c502..b1b8277f3f 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 6c216dde48..af39568ce5 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -56,7 +56,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ sparse \ tar \ tesseract-ocr \ - tesseract-ocr-eng && \ + tesseract-ocr-eng \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/docker/dockerfiles/fedora-win32-cross.docker index a5689b616b..f092b333c9 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -59,7 +59,8 @@ exec "$@"' > /usr/bin/nosync && \ tesseract \ tesseract-langpack-eng \ util-linux \ - which && \ + which \ + zstd && \ nosync dnf autoremove -y && \ nosync dnf clean all -y diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index c066c20241..f35cd5145e 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -59,7 +59,8 @@ exec "$@"' > /usr/bin/nosync && \ tesseract \ tesseract-langpack-eng \ util-linux \ - which && \ + which \ + zstd && \ nosync dnf autoremove -y && \ nosync dnf clean all -y diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 4dd1fce890..e030c5fb1e 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -130,7 +130,8 @@ exec "$@"' > /usr/bin/nosync && \ xen-devel \ xfsprogs-devel \ zlib-devel \ - zlib-static && \ + zlib-static \ + zstd && \ nosync dnf autoremove -y && \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 7ea22a8c1e..335d3e071c 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -120,7 +120,8 @@ RUN zypper update -y && \ xen-devel \ xfsprogs-devel \ zlib-devel \ - zlib-devel-static && \ + zlib-devel-static \ + zstd && \ zypper clean --all && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index ed5855295f..2c3d539949 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -126,7 +126,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tesseract-ocr \ tesseract-ocr-eng \ xfslibs-dev \ - zlib1g-dev && \ + zlib1g-dev \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index 6fea090f02..3f7d30e5d0 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -127,7 +127,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ tesseract-ocr \ tesseract-ocr-eng \ xfslibs-dev \ - zlib1g-dev && \ + zlib1g-dev \ + zstd && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.yml index 2854748f49..af3700379a 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -116,5 +116,6 @@ packages: - which - xen - xfsprogs + - zstdtools - zlib - zlib-static From patchwork Tue Feb 28 19:06:53 2023 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: 657494 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3100165wrb; Tue, 28 Feb 2023 11:16:00 -0800 (PST) X-Google-Smtp-Source: AK7set/1QlODX4FRc8fPDQ+nKrYUY5wL2fscQ91uSJcSR+MnL56jUKTgaiD86kJNxPtccVDG7UjU X-Received: by 2002:a05:6214:e88:b0:574:d6d:a317 with SMTP id hf8-20020a0562140e8800b005740d6da317mr7072778qvb.39.1677611760685; Tue, 28 Feb 2023 11:16:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677611760; cv=none; d=google.com; s=arc-20160816; b=j4S9I4V/c7ipl+3TbS0S3HqC3LAUixZnRXHTj/sfw9tfV6cfcLstITFsy/TQgfSu4x uaRM1e1dq+y+xCLWNrbXOn/e0cRGvXKP1RWTgY4i/Wz/xlIGHWW6dDZUsixVC23fd8L0 glJ0e3vvoMHcavOkwZpbCWRWgg2rw5lT4lepp2OvjM6J5UFFvm06P5yjb6OnuvBZiIO1 75GwRigkPUQQH7qZ/bnaFPGJ+BOJlC1wU0AIatbJRGNE6S3gW119IvNuG7BPRufH+mMK cKycaR211CVV6sv8z9Ed3YpGthODMCk6otu8TE0L17wSnAYHYA9Riu6T+Y3KFkLbekiY Hsyw== 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=juqxsICOPp3A62rldcSyP/QqnqSG5zUxj23C7nES3tg=; b=kSZ7j3SvuxlBw5Z1kAAvX/cW47PKr8LMCt+dXD4/0Mo3x3mQ8LoYNxJayDXTBWtX9r ydKWVLCeM5CxgB1A/mzsCf75XQzuidZpKL/ua4V/nVNYtsfhlUr/1YNMpwRxBrwIfkOQ +t3RfJgh10XFFWfJK+wcIOrslQJkEJAr1BnRGwDMezwIo3nfSGOW2HB967ocjFvHvJxB 3wVHBuQ2BkJal5Dxp8nwYAT5wubR+PEYSnicgK5QwGkLFB+5baVJl1m0hcC8/nRDHBLV 2Ez2J0F+jx0fHCi9jIyPNaiNWkCCirM66mMCnpNmMoGbeoVmgvnISbKpgjq0QCx/5oIj Or4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aEifid6C; 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 s10-20020a0cdc0a000000b0056eb1a4165esi10062846qvk.401.2023.02.28.11.16.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Feb 2023 11:16:00 -0800 (PST) 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=aEifid6C; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pX5Qr-0000Qi-2A; Tue, 28 Feb 2023 14:14:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pX5Qp-0000Pt-2w for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:14:35 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pX5Qg-0004fL-DO for qemu-devel@nongnu.org; Tue, 28 Feb 2023 14:14:34 -0500 Received: by mail-wr1-x430.google.com with SMTP id t15so10892210wrz.7 for ; Tue, 28 Feb 2023 11:14:25 -0800 (PST) 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 :message-id:reply-to; bh=juqxsICOPp3A62rldcSyP/QqnqSG5zUxj23C7nES3tg=; b=aEifid6CNHyOm94lyGmnYvg9LqvQC1l38G5B8CHEY/MpZhu7C5ZZ/o5gZ7lb8B6x/R n52w2h5ULodce8p+8OPv2/1+R8aemxUSZ7dZ9CfhqYubBDUIlSAK0ING3I9LPoOigEp3 hEGAyoDzS6We3/13w1+f7QekweoxMuDt3o286NQo3TqfOkEy0t+7GPkottKgca70YNg6 hQB/7nmluBgrhLGPpuEx5g3SHHPxQp/edpypH2/NZk4etbhE75EEIKFBoIZf8mBvuAms h132Ji9kvGlSReoVfUE4bb6YPSRCy1mPY3N3wBC/GUc6e0mfllyCTqTtHXIPP5vnNeYI GMQg== 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:message-id:reply-to; bh=juqxsICOPp3A62rldcSyP/QqnqSG5zUxj23C7nES3tg=; b=lfJ66jQ57RIiW4j9t7Dbrcm+76c92xmEP7eRtCOkdAP5CcZcNCyEyrs15X0vSUo81M 2y2R0apain2jGPMRkFpI3MFpe/l8QSNwurqHFlprOCrn2puRXT03VLdUVo30F6aZcJjb FVeqw1nDjyD5NFQmkPNuoOiVHHuoHCPR/GN/ysTi3ALjxnlqhjatLmGRyp7YEnzarbbj uIKcH62ZHKPTc2uXetxHRQ0isk7vTBonkSmzAdeYZu20M7UJQIPPpoEProA16GBryHtr 3JLfvH/g/d3f1Z478jF2XnMsuOp/PuVxF6QwH/+MF+2XOrtunT0XMnTUfWtTu4YvDosd V28A== X-Gm-Message-State: AO0yUKWWQkay+1TlAczlgaXQLDxLVYnRO9c4jS47hmaUWWQ727J/o7rp R0VD3PfYZvdGvqmJddSSmBrM5A== X-Received: by 2002:adf:f583:0:b0:2cb:8f6a:6e7f with SMTP id f3-20020adff583000000b002cb8f6a6e7fmr2974313wro.35.1677611662356; Tue, 28 Feb 2023 11:14:22 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id n5-20020a5d51c5000000b002c70d97af78sm10764063wrv.85.2023.02.28.11.14.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Feb 2023 11:14:20 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8BCB51FFCB; Tue, 28 Feb 2023 19:06:56 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Michael Roth , Peter Maydell , Kevin Wolf , =?utf-8?q?Alex_Benn=C3=A9e?= , Beraldo Leal , Alexander Bulekov , Aurelien Jarno , Markus Armbruster , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Darren Kenny , Hanna Reitz , Cleber Rosa , John Snow , Ed Maste , qemu-arm@nongnu.org, Fam Zheng , Thomas Huth , Yonggang Luo , qemu-block@nongnu.org, Paolo Bonzini , Stefan Hajnoczi , Bandan Das , Li-Wen Hsu , Pavel Dovgalyuk , Laurent Vivier , Bastian Koppelmann , Qiuhao Li , Wainer dos Santos Moschetta Subject: [PATCH v3 24/24] tests/avocado: disable BootLinuxPPC64 test in CI Date: Tue, 28 Feb 2023 19:06:53 +0000 Message-Id: <20230228190653.1602033-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228190653.1602033-1-alex.bennee@linaro.org> References: <20230228190653.1602033-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 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-bounces+patch=linaro.org@nongnu.org This test is exceptionally heavyweight (nearly 330s) compared to the two (both endians) TuxRun baseline tests which complete in under 160s. The coverage is slightly reduced but a more directed test could make up the difference. tests/avocado/tuxrun_baselines.py:TuxRunBaselineTest.test_ppc64: Overall coverage rate: lines......: 9.6% (44110 of 458817 lines) functions..: 16.5% (6767 of 41054 functions) branches...: 6.0% (13395 of 222634 branches) tests/avocado/boot_linux.py:BootLinuxPPC64.test_pseries_tcg: Overall coverage rate: lines......: 11.6% (53408 of 458817 lines) functions..: 18.7% (7691 of 41054 functions) branches...: 7.9% (17692 of 224218 branches) So lets skip for GITLAB_CI and also unless AVOCADO_TIMEOUT_EXPECTED is specified by the user. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- tests/avocado/boot_linux.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/avocado/boot_linux.py b/tests/avocado/boot_linux.py index fe0bb180d9..f09f7b1dbf 100644 --- a/tests/avocado/boot_linux.py +++ b/tests/avocado/boot_linux.py @@ -84,6 +84,8 @@ def test_virt_kvm(self): self.launch_and_wait(set_up_ssh_connection=False) +# See the tux_baseline.py tests for almost the same coverage in a lot +# less time. class BootLinuxPPC64(LinuxTest): """ :avocado: tags=arch:ppc64 @@ -91,6 +93,8 @@ class BootLinuxPPC64(LinuxTest): timeout = 360 + @skipUnless(os.getenv('AVOCADO_TIMEOUT_EXPECTED'), 'Test might timeout') + @skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab') def test_pseries_tcg(self): """ :avocado: tags=machine:pseries