From patchwork Tue Jul 11 14:49:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 701521 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp5761591wrs; Tue, 11 Jul 2023 07:50:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlFucL9dhOZn5ECY7LQAvMQnTxUK83Htw4Ul7ZCGk4jlEtzpqFz4dz5nUZaZsWS0i4C2Eaay X-Received: by 2002:a0c:f18a:0:b0:632:b37:3327 with SMTP id m10-20020a0cf18a000000b006320b373327mr13409456qvl.56.1689087018961; Tue, 11 Jul 2023 07:50:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689087018; cv=none; d=google.com; s=arc-20160816; b=G8hHb5WqaWFK3VBBpZdBU06THWVg0t+0O0V3OU1x8Qyf6XDoxBKUZMs8Sv46YiMrzO G9VOAeeWZXGQp5pjopgxUtPSnbaDJI1IA1CvDQKlmSEDtp9xWZdtJTXmHXXpsFEVuas9 P4k8mnJ0XJgYnelFAu8in1tTjWY58XLL2u+SCLG6pgY1Ms5XyABQ3KYIqVPsfDnTfsA6 iD0w0Aldgjpd6La3ECP09AlPEIAYNyGYe6SzlXoY4fBEmeRjjyY3JIz2l+ldRKKT/NQh 1NFBjTsidvQ6Ho3JtKP/E23ncfvASvv+7pkPxuxQACDUeZHEzmrp7LeC567zJP9BuK6O pKZg== 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=a3Kb8EGzX+FYyoa01i/LLklvXAPWnwahDSy93HfoU3M=; fh=rN/eMtQuTlvWYS5S98Qlg+9zwvtNKB2+ClDmDM0vn/w=; b=Liywd+MdHrM5yNmbusmdkg8bdL4tzceUVwN+Xr7dlvz+b5QQr6uCQWMV1cnhPUJn+y IcLZ/5kV45YrRSnKy1+59U1NCjO5Gntmva4l2ZNika+jgahvM5AWocpRUyCOvyUqqayu vHQLYfjMo5zEAdiiRXxTUhb0+XuEuQHblyJo+rRGcsvsyi5re/Ve7p/cp/DQx5H3ZGhD AG7/fDddV90pAvWf2mKUmA4zdylfdJ6DMEZNtnbrYycGVFpc/lN3o97GaT0dnj9QyjgQ zwiEIHBiRvvlDGBxQu5zd6CPLu5VS0N3QQcp685rev1xU1/6xQolXeV47qX9N5PlJ99Z 8cuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h7AJPPbA; 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 a3-20020a0ce383000000b0056bfa655111si859704qvl.27.2023.07.11.07.50.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jul 2023 07:50:18 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=h7AJPPbA; 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 1qJEgL-0001FW-Io; Tue, 11 Jul 2023 10:49:37 -0400 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 1qJEgJ-0001Ev-Ef for qemu-devel@nongnu.org; Tue, 11 Jul 2023 10:49:35 -0400 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 1qJEgH-0002mU-L9 for qemu-devel@nongnu.org; Tue, 11 Jul 2023 10:49:35 -0400 Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2b69f958ef3so92874621fa.1 for ; Tue, 11 Jul 2023 07:49:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689086971; x=1691678971; 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=a3Kb8EGzX+FYyoa01i/LLklvXAPWnwahDSy93HfoU3M=; b=h7AJPPbAtRR0fgeagkHwflPaWZjBjeBYN1x+wmn5GLEKcc3fCVLLJ3TYvZaJJyzloH ROj3hrKTXiCKVoeBKCLHFvC04g3jxXkGdqrgVeTT1CFMVwqI74gGOikLMrOoKZ6zF3Tb EpFHs+EeYcnhM2t0JElWavAhqRYHuXLl3Xd1+lpPDn8QBhu5GELDqrbSiuknOEeosJkF IXbjDOlJTcVzrcC8N3xJmtU2EZ5ROsNGb0SNDkP9kIVq4Ct23siNaP+IlWFPowWpuARC XHn0kCNTE4+ZdNdwFy5tDxVJJEha4GzOsui8fM81qin9NcXnS4chc7nnREBvOP1E1nIK mpgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689086971; x=1691678971; 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=a3Kb8EGzX+FYyoa01i/LLklvXAPWnwahDSy93HfoU3M=; b=eSnYJLLtT4isUswcp5s77FPYHz6LPV6fbHqIWR2MQ9WfpXs60RlpxogS1+72OxN72A egZG9u9C5RQ9rWZx3+2caKOd9zWgvSwEFb/cp2gsxfh0Vp27ooXoG5hSRFV+S5A6sRni 2ngC9zP+RJzZrHrPDt1D3aHnySR86XpQLEE4L4WSi82vIYLw7lSlDT3BfYL99HISlt0s 9KJqbPYjp7hpCIxAwM+tpjaqEfFX2+xOJetPIYmNSmgHK0W0ItPbTIr7sMFZUJl5cDVx N4lCnYs38YC0J4fCKXjVyjZ9e3y2cc9u1gt+LYygmgxWQgX0QJ81Zp8ca/6gME0ArJ9r 7rdQ== X-Gm-Message-State: ABy/qLY0PHX/hqhsrHiXCd2Lv10nz9vt3B2i704dYn7l5rAN240T7Wp0 nHDp4YIh+Xs35kou0l0/msW2PuUWd57aOrTlVXI= X-Received: by 2002:a2e:b04a:0:b0:2b6:d0fc:ee18 with SMTP id d10-20020a2eb04a000000b002b6d0fcee18mr11620888ljl.19.1689086971524; Tue, 11 Jul 2023 07:49:31 -0700 (PDT) Received: from m1x-phil.lan ([176.187.194.156]) by smtp.gmail.com with ESMTPSA id j8-20020a170906830800b009927d4d7a6bsm1260851ejx.53.2023.07.11.07.49.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Jul 2023 07:49:31 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Thomas Huth Cc: Warner Losh , =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Erik Skultety , Wainer dos Santos Moschetta , Kyle Evans , Li-Wen Hsu , Beraldo Leal Subject: [PATCH v3 1/4] tests/lcitool: Generate distribution packages list in JSON format Date: Tue, 11 Jul 2023 16:49:19 +0200 Message-Id: <20230711144922.67491-2-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230711144922.67491-1-philmd@linaro.org> References: <20230711144922.67491-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22e; envelope-from=philmd@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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Add the generate_pkglist() helper to generate a list of packages required by a distribution to build QEMU. Since we can not add a "THIS FILE WAS AUTO-GENERATED" comment in JSON, create the files under tests/vm/generated/ sub-directory; add a README mentioning the files are generated. Suggested-by: Erik Skultety Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Warner Losh --- tests/lcitool/refresh | 11 +++++++++++ tests/vm/generated/README | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 tests/vm/generated/README diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index b54566edcc..4584870ea1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -84,6 +84,12 @@ def generate_cirrus(target, trailer=None): generate(filename, cmd, trailer) +def generate_pkglist(vm, target): + filename = Path(src_dir, "tests", "vm", "generated", vm + ".json") + cmd = lcitool_cmd + ["variables", "--format", "json", target, "qemu"] + generate(filename, cmd, None) + + # 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 @@ -191,6 +197,11 @@ try: generate_cirrus("freebsd-13") generate_cirrus("macos-12") + # + # VM packages lists + # + generate_pkglist("freebsd", "freebsd-13") + sys.exit(0) except Exception as ex: print(str(ex), file=sys.stderr) diff --git a/tests/vm/generated/README b/tests/vm/generated/README new file mode 100644 index 0000000000..7ccc6ffd3d --- /dev/null +++ b/tests/vm/generated/README @@ -0,0 +1,5 @@ +# FILES IN THIS FOLDER WERE AUTO-GENERATED +# +# $ make lcitool-refresh +# +# https://gitlab.com/libvirt/libvirt-ci From patchwork Tue Jul 11 14:49:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 701524 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp5761920wrs; Tue, 11 Jul 2023 07:50:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlET+cK22hw6bu6+CEZAmuTITxvgp7+N0JdMJphxD3O/Q17YKrO+oTzR6FxjtYKrRaSqbdTM X-Received: by 2002:a05:622a:1a1c:b0:403:b41b:cbb8 with SMTP id f28-20020a05622a1a1c00b00403b41bcbb8mr4107872qtb.7.1689087054652; Tue, 11 Jul 2023 07:50:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689087054; cv=none; d=google.com; s=arc-20160816; b=YEzmkCzgiLCuT6fgo7Krg9/gLJCgcORehFyUSVJJRTFoU/JrJxR8osG70DsIWvRcJg RQimaKZmhxhJiAwDpLMRIoz0HuttPCddOrXAML/foNPwupJ0KwX9qttbV3RtdxS2WuMr fZkqLmQrWwX5BEP/hweZ/qqKWjXHDesdcqcprjIkGlwW8pyFxHBxzLEnKqJHIOAMk3Zf prG9EUvbefeS6VaDFpWguWQMbP/+SJZpBt04Bh+7PM7+hsQwAyWYzqSvvQPOWVaiVwy9 xa4tBYSvUjLE414Ga7kAefh5g9CUmdK7uvvXARTUfrHlBty6jB/CpkSlD3ygFIDCQL1M Qk3g== 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=WJlBlsN50lnGlgulpATju4N8RnhzQCtwxBch73Vn4hk=; fh=rN/eMtQuTlvWYS5S98Qlg+9zwvtNKB2+ClDmDM0vn/w=; b=tnr7+BWAwRM7DshEFbUhunu7aTADpGV4p2phMUtWbbdt3F6455PiCvJP86eHgQ5ucs b4aSsh0QfWjbfo8wL0Bl6IR4pDy4tNqCvxmGo4mDuqDaLMJOd26r9DLDsZru2VFH5nGm Dfnp6KfV0sDVMVN4bpAksx/WfLy2CkfXIkNlvJYSsvLvRzDpLomXGqR017gMzQhS56sO SfRgfweEuCMmV3QX6H07vDIu3tl9Wb94TdFjiZXZclkv3ISUz8YFy1rKLvj+YSOQ4oFF +XES6WLSRSrVcIV/rQs8rBqZWrEEjND0VnX+kHfwd6n27aE9ZmegrcSNzGiALAWwKJT7 ZI0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s4UANqLs; 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-20020a05620a041200b00763bcfe3048si859401qkp.401.2023.07.11.07.50.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jul 2023 07:50:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=s4UANqLs; 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 1qJEgR-0001GE-Ms; Tue, 11 Jul 2023 10:49:43 -0400 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 1qJEgP-0001Fz-Qe for qemu-devel@nongnu.org; Tue, 11 Jul 2023 10:49:41 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qJEgO-0002nT-5n for qemu-devel@nongnu.org; Tue, 11 Jul 2023 10:49:41 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-98377c5d53eso733725966b.0 for ; Tue, 11 Jul 2023 07:49:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689086977; x=1691678977; 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=WJlBlsN50lnGlgulpATju4N8RnhzQCtwxBch73Vn4hk=; b=s4UANqLsS0bbwcyDFUBec/S2GJgPnADcdbi2TnLEWB14Yrm4oH9AuncIkR0uVVGRWT 2RaKOTWBx6d3ZqgfOMDIBNsFr3pb9T7l23Jz7xk4bkn8O7f3o9Vgo07riDSUwfvkpFyz j9q+N4zmgX9SmGHve/jvvmZVTUsK0lMiC3Sf83ObLOPYKnog3p9OHEVZhVhZp6u2jVPv +s5JL2N/ftY0oW6mJxCuN4uE3z6cucpPkEPsbJkCJdSpv5DI3MGIgc9sfI+SJTic43EV mNiOwkpSt1MAAGX9Y7E3LlqDTTGhlhrzqpolJ8Q6QagBX2Q3+Ou63RQ6hmpI9t/srL1w nhuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689086977; x=1691678977; 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=WJlBlsN50lnGlgulpATju4N8RnhzQCtwxBch73Vn4hk=; b=IHkQ6A3VasBz9QEFT+aZ9hogus+X2WGt/vYK1acBomzHHRkU+B9nEe0YdpPEkV7Rwh aE9TQvMZ9vQRPQubOt6qVzgHeaXyeIj6zd4au9ITmJg5FaSpvZER5uwH18fbdbbCYzdZ epNP8w7cWH7ARzcKI4QWwrJXFhXCHCLY30Gp+Bbe+HbhmStmrvp4gKD03ziRtDXY69PI MKCHNh5qVi0GmjQqilEPqKb1cXThZq3lPgusOLK2Of2MhbaU2Tqun1UBCZXfXiOxjS9v 6qH/aK6AqZimYtWViCW7JWNwxvpfuC4oM7ThT+OHmvOmHx1vXw4MijFYzKdRO/Lp/khe fwUw== X-Gm-Message-State: ABy/qLYd0VghvlZ5XDQWecqrRYDWA8VwRG94asiNSlIhTeJ7FDggV6sS j7ulw+mjFS13GxWijrxCl9rSgVPycychKwS+b3E= X-Received: by 2002:a17:906:100b:b0:992:bc8:58e4 with SMTP id 11-20020a170906100b00b009920bc858e4mr16978966ejm.20.1689086977604; Tue, 11 Jul 2023 07:49:37 -0700 (PDT) Received: from m1x-phil.lan ([176.187.194.156]) by smtp.gmail.com with ESMTPSA id um26-20020a170906cf9a00b0098e17ea781csm1263296ejb.94.2023.07.11.07.49.36 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Jul 2023 07:49:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Thomas Huth Cc: Warner Losh , =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Erik Skultety , Wainer dos Santos Moschetta , Kyle Evans , Li-Wen Hsu , Beraldo Leal Subject: [PATCH v3 2/4] tests/lcitool: Refresh generated files Date: Tue, 11 Jul 2023 16:49:20 +0200 Message-Id: <20230711144922.67491-3-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230711144922.67491-1-philmd@linaro.org> References: <20230711144922.67491-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=philmd@linaro.org; helo=mail-ej1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Refresh the generated files by running: $ make lcitool-refresh Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- tests/docker/dockerfiles/debian-amd64.docker | 2 - tests/docker/dockerfiles/ubuntu2004.docker | 2 - tests/docker/dockerfiles/ubuntu2204.docker | 2 - tests/vm/generated/freebsd.json | 77 ++++++++++++++++++++ 4 files changed, 77 insertions(+), 6 deletions(-) create mode 100644 tests/vm/generated/freebsd.json diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-amd64.docker index e39871c7bb..8f7521fdc2 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-amd64.docker @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libpam0g-dev \ libpcre2-dev \ libpixman-1-dev \ - libpmem-dev \ libpng-dev \ libpulse-dev \ librbd-dev \ @@ -96,7 +95,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvdeplug-dev \ libvirglrenderer-dev \ libvte-2.91-dev \ - libxen-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 8f864d19e6..7f60143cbb 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -69,7 +69,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libpam0g-dev \ libpcre2-dev \ libpixman-1-dev \ - libpmem-dev \ libpng-dev \ libpulse-dev \ librbd-dev \ @@ -94,7 +93,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvdeplug-dev \ libvirglrenderer-dev \ libvte-2.91-dev \ - libxen-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker index 1d442cdfe6..5162927016 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -70,7 +70,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libpam0g-dev \ libpcre2-dev \ libpixman-1-dev \ - libpmem-dev \ libpng-dev \ libpulse-dev \ librbd-dev \ @@ -96,7 +95,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \ libvdeplug-dev \ libvirglrenderer-dev \ libvte-2.91-dev \ - libxen-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/vm/generated/freebsd.json b/tests/vm/generated/freebsd.json new file mode 100644 index 0000000000..7c435cf23e --- /dev/null +++ b/tests/vm/generated/freebsd.json @@ -0,0 +1,77 @@ +{ + "ccache": "/usr/local/bin/ccache", + "cpan_pkgs": [], + "cross_pkgs": [], + "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", + "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", + "mtools", + "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", + "xorriso", + "zstd" + ], + "pypi_pkgs": [], + "python": "/usr/local/bin/python3" +} From patchwork Tue Jul 11 14:49:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 701522 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp5761606wrs; Tue, 11 Jul 2023 07:50:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlEzOHPzXxTDSqpdsjcq39DBT4rGMh/h3Sr4OKraFwlNC8K/d0cup96ks7cWgJCkbZx+07is X-Received: by 2002:a0c:e312:0:b0:636:435:377a with SMTP id s18-20020a0ce312000000b006360435377amr13794118qvl.16.1689087020775; Tue, 11 Jul 2023 07:50:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689087020; cv=none; d=google.com; s=arc-20160816; b=GYaCRjnwBZ+hRc9GNzW6im+/Oc0v0jnb1hY+627ZJ4+q2RQvaSdkbZ3Z3BhMDNy3Z+ sZm/Gsp1hBbRtBMZoEgX5PoYn4RdaQ7Ym3+6KDawlS4JORGZg9ZKFj8uA2tuWxr8mF47 UzulDglQXXhpSBntZns59B9ZkpgQ1Bo5nyD6viRd7FkvsCeq/Zqt7wasA1JQol6eTl1t /AKeYIj5Cv7XcF6jVwj8lx9jS9I200ONJxxNq8I+FRniJmRK2+MG6AJRLCpQDUcHiRc6 zGhAHGDASUoMb7A9Z4siIdp1zcc++UZrXvtD0tttqooDe64Ll03hD0JMrHkF7s2YGMto q4PQ== 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=DQpa/hfpAq5E6avQ+sBqrAEF6fPdfI9vuVD97imT8vE=; fh=rN/eMtQuTlvWYS5S98Qlg+9zwvtNKB2+ClDmDM0vn/w=; b=aF91xfNdRLFGcK9jXKjpPmCYuU6RJ+lUPcNdX3jNYKDexpWYrBTGwkq5yz+WDDOJFB HoAYpwqEj7AQy7fGpRfOjw8WzDXDxg2U5jdb8Tz+A1kvxCi0TW/63ED4uBtFNRCI5b+j 1sLRxI9/qqFXtwnIo2bf1f+bp2gIwn70JNxaTlJaO1FUyRP67v2iRF4uVfMhGErAu0pd byyCuZYOHGkIiKvuRO2AMmi6DppnnaYw1Jsn+CIZ6z5z76JCBqXowzCCYV086qJaMTd3 tcKeDbqRRr1jZXhOQ8cvK49eBJNysB5ZQ9lVoK6ClnnkL2rC9coBxuGIr2p4AM4aEkaV RMWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=elItkfJU; 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 i24-20020a0cab58000000b005ef470bb7c8si847462qvb.366.2023.07.11.07.50.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jul 2023 07:50:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=elItkfJU; 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 1qJEga-0001H6-6f; Tue, 11 Jul 2023 10:49:52 -0400 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 1qJEgY-0001Gc-Co for qemu-devel@nongnu.org; Tue, 11 Jul 2023 10:49:50 -0400 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qJEgT-0002oB-D0 for qemu-devel@nongnu.org; Tue, 11 Jul 2023 10:49:50 -0400 Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-98e39784a85so1388299666b.1 for ; Tue, 11 Jul 2023 07:49:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689086983; x=1691678983; 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=DQpa/hfpAq5E6avQ+sBqrAEF6fPdfI9vuVD97imT8vE=; b=elItkfJU2ESHqMFI5dBdmImo6shfsO3P2JzUdo1pO4tFYCYLuNJ7G9WMB3n1HpAVp4 wi4nawp07DPujTSJ/qZlGTRDdLW/M3Fc6izltzFeZbph9GjtV9r7xTj9m4PHv4CWR3oi KRtOeMie0yaYiuL4hqsYrOoxlSYsNFEJ86TPygAD5B19etrwQG/U/mhEK5JCoHkzkgJh RyTXsUyBo5xRwW/6+oKvzrQYIm8o7mqYTWRTlawE6azAczBDH7EgwI+8/f/DNH9uydfu QYUdHmV5c5GQi2zpd2OcZN7KodR1ouWDEoVtX2CgAN+ZLK1HTYtpCQjF4lGhZm2SVfBI gbFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689086983; x=1691678983; 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=DQpa/hfpAq5E6avQ+sBqrAEF6fPdfI9vuVD97imT8vE=; b=UnEEEMkLTnHPk1DL6P+FHJwHU7I+/nHdCm3SQPMWdewtrfBKUIIpRSDscEv33XuGVK Lrnd6Krs4l8HlK3K+qV6pAL2wslSFb8WSEpgHMcGOnKbrc/mtUxxeXixWByjR8NQB6M6 zI1IuMx3TUSii3h2oUynT3gItOgTEd5h9mztOw+tJLgT5db3kmrfgwjuEcaaHQrnWs3W uBJf6W+URNfpA+mbB+HAvKfJx4RtaH3JyYvTgVpAGgbFOkiHif7R8sVd1Q++631w8/Fz onlCHmL1ci5pq9nf8aMHkmmT3uX3d6XeY4EvSAM8it/JOq4wQ957tamljnNVmwQQxfEd U/yg== X-Gm-Message-State: ABy/qLaqloQNvxlqhnx6A8iLRftPaiFhnxXGh7zvQHrQGjMV7v0TknSC Oa9DI/tbjhtDg9abcHw597Oxx0lLauNkPBTe31Y= X-Received: by 2002:a17:906:648d:b0:993:e695:b585 with SMTP id e13-20020a170906648d00b00993e695b585mr15875875ejm.9.1689086983713; Tue, 11 Jul 2023 07:49:43 -0700 (PDT) Received: from m1x-phil.lan ([176.187.194.156]) by smtp.gmail.com with ESMTPSA id s7-20020a170906284700b0098e48ad11f2sm1268031ejc.93.2023.07.11.07.49.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Jul 2023 07:49:43 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Thomas Huth Cc: Warner Losh , =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Erik Skultety , Wainer dos Santos Moschetta , Kyle Evans , Li-Wen Hsu , Beraldo Leal Subject: [PATCH v3 3/4] tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper Date: Tue, 11 Jul 2023 16:49:21 +0200 Message-Id: <20230711144922.67491-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230711144922.67491-1-philmd@linaro.org> References: <20230711144922.67491-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=philmd@linaro.org; helo=mail-ej1-x62c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Add the get_qemu_packages_from_lcitool_json() helper which return such package list from a lcitool env var file in JSON format. Suggested-by: Daniel P. Berrangé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- tests/vm/basevm.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 23229e23d1..a97e23b0ce 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -27,6 +27,7 @@ import multiprocessing import traceback import shlex +import json from qemu.machine import QEMUMachine from qemu.utils import get_info_usernet_hostfwd_port, kvm_available @@ -501,6 +502,16 @@ def gen_cloud_init_iso(self): stderr=self._stdout) return os.path.join(cidir, "cloud-init.iso") + def get_qemu_packages_from_lcitool_json(self, json_path=None): + """Parse a lcitool variables json file and return the PKGS list.""" + if json_path is None: + json_path = os.path.join( + os.path.dirname(__file__), "generated", self.name + ".json" + ) + with open(json_path, "r") as fh: + return json.load(fh)["pkgs"] + + def get_qemu_path(arch, build_path=None): """Fetch the path to the qemu binary.""" # If QEMU environment variable set, it takes precedence From patchwork Tue Jul 11 14:49:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 701525 Delivered-To: patch@linaro.org Received: by 2002:adf:fcc5:0:0:0:0:0 with SMTP id f5csp5762020wrs; Tue, 11 Jul 2023 07:51:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlFP+iGvGSjXryR1ighQSCcz8Lo21WBmZLhrlE7bqoGBuC6YDEiFMZplOg+jRWWnoxdrEG7v X-Received: by 2002:a05:622a:14d0:b0:401:e0d8:25f with SMTP id u16-20020a05622a14d000b00401e0d8025fmr18109076qtx.10.1689087066742; Tue, 11 Jul 2023 07:51:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689087066; cv=none; d=google.com; s=arc-20160816; b=HSiFmKI8hRvLveEWoK8wtLijj00QBGLlXrhnXl9pgaqNM5e5Gp8asLjltfo3zEI+re Fk4zdCPBBQ8owBHpqylUKwUC5lev+yBG25uOpyLGz8iWnq6Zi2x/cOzHw8jrCkT1KQ7p OZmK0JI+uNBPPa/1CuXo3LIq4SWlxbiDXkCBR5+G0uc/Hi2cQ7IHZEPOJFVOLr4qsMpA WNFLdKlSyTr25QWsbHKN2Pn12dP4g6D+eiYZU2kca2qK25Z810ZxnGKfTbR/a30x1vD9 Hcy1x05InTz60FLNJeN5dZd3k5lHy38PZd25lCllvb2yAwzY+Z3xQ7tEg2n+rrEkgyzw zwPw== 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=2C3ulhpGXegeRpApeYEbk/7DUySfSH+Hku3qJHK2GJw=; fh=rN/eMtQuTlvWYS5S98Qlg+9zwvtNKB2+ClDmDM0vn/w=; b=logWNDuFDJ5PVTDT8bIEheCl5Wgx1E00271Lg4cZ/0KsK/dYaohxeqVE4ZuxkZptj+ ZgGiGdSMcKlBsQMERk7VwJ9rf1Nu9S8R0R4Z+UF/qmsjPdPDlMlVllwEG6u/zrwPwBPC hBDiY2Q/cuTXzwy8uIz0AEDD6kGX6bOSZg8WSMEc3GyEdIUVqVZ4f6c91V+PiYUohGFX Yi3TfNr+iJH8+IdNBlNjKQjoHuBkROx78qdoJFP+RnHZ3JeGrxypoKT5yeqsu+nLBlb/ RcE7O7gfnZltplL0kmbKUOvx9OFhImnAGwY9oY2XQxBfAXawu16HyNHLNRGlCIK73Iq9 Fh5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i6XEWJ65; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id c12-20020ac87d8c000000b004034c41f427si864833qtd.97.2023.07.11.07.51.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Jul 2023 07:51:06 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=i6XEWJ65; 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 1qJEgc-0001HF-7l; Tue, 11 Jul 2023 10:49:54 -0400 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 1qJEgb-0001H7-5e for qemu-devel@nongnu.org; Tue, 11 Jul 2023 10:49:53 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qJEgZ-0002og-FZ for qemu-devel@nongnu.org; Tue, 11 Jul 2023 10:49:52 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-993a37b79e2so733097666b.1 for ; Tue, 11 Jul 2023 07:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689086989; x=1691678989; 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=2C3ulhpGXegeRpApeYEbk/7DUySfSH+Hku3qJHK2GJw=; b=i6XEWJ65wcJd9ZSZQpN7XjgapelcMRwQaGuqQw12NcxWXiLWX53oReXCxb115XYy9i o0aQ8pApGP/33HrryPU5ySGhq7DUTFHNIn9lOT6rCMh6Mkvhox0+y4coWZ2BwxzON+WF +Qn8ZyXYhx9s0oS64ACFGuX13lQxnR4Av+3qHuc4FqQYlrhBDU47n783gtYHpFqBHpmR ij6vy97y4n3Z4OEzrsHoedEvaEzj8qVehq3mKWdWereUTSIB1nAQ0g4AChIoQQh8kPVu VTjfmtC0PqTMRmuEHcQbd1paDB34titoVzWi/pZ79wRLMV1nxYcn6xu8oa8jTygYWgSi 78Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689086989; x=1691678989; 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=2C3ulhpGXegeRpApeYEbk/7DUySfSH+Hku3qJHK2GJw=; b=T2lmDR6v2s0Oudxd+fD0wX+UVg6Z3/+OofWf+WfcgUVe/YCSvdQtQkYHbffS4zTsEs IxgGQML+lOcmr084YwOFhzIvjiqc8oYK5lmjTpPpl/ZPfC+tTW6MZezCYKGCZcmm+/9T QHXmKe/a6U2FVj/VC2CfdtjsSE+lrt7z5Xrd/JcXUsikDkOqPCRIg5MIAc1lND3KOPmH TcI6icAbaVegDFjS3wMHyt2mqJ1Riaqw9OcJxQ3Z/vluMUBN+obqcS8zw52JZ7fOFxLt BIpxzFz6r54gyzwsngpCf48bFQh1nkRC4hCO2S/vHcI06tknOch/4gssVtvMzs/KzEMI p3UQ== X-Gm-Message-State: ABy/qLYbYkegeRM3xVCvNGhZqFs/bAJbtlccmSzXUDcKoeaZY85ni20J whiE5kLA7aAaocQsTdbaUvgQX7rfMddz/J4+nvQ= X-Received: by 2002:a17:907:908e:b0:96f:e5af:ac5f with SMTP id ge14-20020a170907908e00b0096fe5afac5fmr15865334ejb.47.1689086989778; Tue, 11 Jul 2023 07:49:49 -0700 (PDT) Received: from m1x-phil.lan ([176.187.194.156]) by smtp.gmail.com with ESMTPSA id qt25-20020a170906ecf900b00992ab0262c9sm1258292ejb.147.2023.07.11.07.49.48 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 11 Jul 2023 07:49:49 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Thomas Huth Cc: Warner Losh , =?utf-8?q?Alex_Benn=C3=A9e?= , Ed Maste , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Erik Skultety , Wainer dos Santos Moschetta , Kyle Evans , Li-Wen Hsu , Beraldo Leal Subject: [PATCH v3 4/4] tests/vm/freebsd: Get up-to-date package list from lcitool vars file Date: Tue, 11 Jul 2023 16:49:22 +0200 Message-Id: <20230711144922.67491-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230711144922.67491-1-philmd@linaro.org> References: <20230711144922.67491-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=philmd@linaro.org; helo=mail-ej1-x632.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Get an up-to-date package list from lcitool, that way we don't need to manually keep this array in sync. Inspired-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé --- tests/vm/freebsd | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 11de6473f4..ac51376c82 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -31,45 +31,6 @@ class FreeBSDVM(basevm.BaseVM): link = "https://download.freebsd.org/releases/CI-IMAGES/13.2-RELEASE/amd64/Latest/FreeBSD-13.2-RELEASE-amd64-BASIC-CI.raw.xz" csum = "a4fb3b6c7b75dd4d58fb0d75e4caf72844bffe0ca00e66459c028b198ffb3c0e" size = "20G" - pkgs = [ - # build tools - "git", - "pkgconf", - "bzip2", - "python39", - "ninja", - - # gnu tools - "bash", - "gmake", - "gsed", - "gettext", - - # libs: crypto - "gnutls", - - # libs: images - "jpeg-turbo", - "png", - - # libs: ui - "sdl2", - "gtk3", - "libxkbcommon", - - # libs: opengl - "libepoxy", - "mesa-libs", - - # libs: migration - "zstd", - - # libs: networking - "libslirp", - - # libs: sndio - "sndio", - ] BUILD_SCRIPT = """ set -e; @@ -151,8 +112,9 @@ class FreeBSDVM(basevm.BaseVM): self.console_wait(prompt) self.console_send("echo 'chmod 666 /dev/vtbd1' >> /etc/rc.local\n") + pkgs = self.get_qemu_packages_from_lcitool_json() self.print_step("Installing packages") - self.ssh_root_check("pkg install -y %s\n" % " ".join(self.pkgs)) + self.ssh_root_check("pkg install -y %s\n" % " ".join(pkgs)) # shutdown self.ssh_root(self.poweroff)