From patchwork Tue Jul 18 09:30:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 704045 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e4d:0:b0:314:25da:8dc4 with SMTP id r13csp1430247wrt; Tue, 18 Jul 2023 02:32:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlH+TZtz0TZQ8SS9vwo0vxOvWy3WdE9FGtW15T2ano9CnkBTCJPeu125h2EG3ZAY068x2juf X-Received: by 2002:a0c:b3c7:0:b0:636:17a3:c624 with SMTP id b7-20020a0cb3c7000000b0063617a3c624mr12500760qvf.19.1689672775556; Tue, 18 Jul 2023 02:32:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689672775; cv=none; d=google.com; s=arc-20160816; b=pIF6kNhGm0QYpSMxvsGtPPUFl5n2Y6hgQXd1cbI9pte2ZbneNbmAZgM0NOt9IOdr9n g3/wTADrieERbRORmyELDdG9hSixqzbjtAxVQw5qRSvavKvfLAOR2wsonGDjz82M/6S8 MfCS7RnC3cTohmkYSdtd6oRzCqjeFP882cKS5f7ijAm6vN5fjE46ZWw5HIVEyA1wpjHo qFkFznl7ORScs51MziVAKzpiLZ/tj9oK903HBG1iBGvuAVSkU/Oe4Z38POcFF8UHVK4Y mFuoQJ5srD7TpOt44TOeRolPS3CVNg0dbI9Y6fsP5Ugm8gb8IHEF3t/XHOVYM26Oq3jO rqvg== 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=oJ2ry9OM+YSeiT0vw1kCfc9VhjQsurGiFSlEOnlyqKw=; fh=Hrxe2sa1HMgBkqqmB8fMkCaucUDoLf/PQHPKBn64alg=; b=tDpD3sWBjwUqqugdQabo5FhAUyvrB2g42q5QD2s3WR7PnXpAQg19U7zXEbDJ8no4Ps ZzmlVJ6p6nYS/Jd8RBOrZLITee0S7DYe2bd1sLxZ1+BqIUxp+vspTnX9o4341lyzz4VH 1HrzHXdv0+DQcmAeZKBanUFLFVAhEoN5F3T490zY2uZPkl8erL1Ou9bBbR3PbIxsGTf3 RYUync2M1KEH4R7Dm2fiWDSn92D0sBVxRDfQ1C3gJpRHkuViZ1wgOzFzb4bL1pOy7G2o jUfe3uV8hWhyPDalbStwcOlHLY7yatWuUy5aGjZgoOOKPl0xFFM97c+4SwfpJYhGa21l OmaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FVASe3ra; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n5-20020a0cdc85000000b0062fe83687e8si966705qvk.268.2023.07.18.02.32.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jul 2023 02:32:55 -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=@redhat.com header.s=mimecast20190719 header.b=FVASe3ra; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLh2l-00041C-VY; Tue, 18 Jul 2023 05:30:55 -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 1qLh2k-00040J-1F for qemu-devel@nongnu.org; Tue, 18 Jul 2023 05:30:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLh2i-0004Dy-DB for qemu-devel@nongnu.org; Tue, 18 Jul 2023 05:30:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689672651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oJ2ry9OM+YSeiT0vw1kCfc9VhjQsurGiFSlEOnlyqKw=; b=FVASe3rawMHMcqA4qxuxv4ojTxmNOXcBz7KHRNGe+oXzJejOujfFMnN9A+l2+GpkOvYnhV 9KKyJrvnjfvRw2JTYQg6iePyC/xRZmop0t9PqYLMhFZjoDTkmO15k6hSG62Gsb9YOTqv9c NJjJrraQt4OKb9CVsqpX/KAgPYhzV6U= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-665-hELKaYECMu2gTCiFKc3MiQ-1; Tue, 18 Jul 2023 05:30:48 -0400 X-MC-Unique: hELKaYECMu2gTCiFKc3MiQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4277989F701; Tue, 18 Jul 2023 09:30:48 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id D45B02166B25; Tue, 18 Jul 2023 09:30:46 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Erik Skultety , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Warner Losh Subject: [PULL 4/8] tests/lcitool: Generate distribution packages list in JSON format Date: Tue, 18 Jul 2023 11:30:36 +0200 Message-Id: <20230718093040.172145-5-thuth@redhat.com> In-Reply-To: <20230718093040.172145-1-thuth@redhat.com> References: <20230718093040.172145-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 From: Philippe Mathieu-Daudé 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 Message-Id: <20230711144922.67491-2-philmd@linaro.org> Signed-off-by: Thomas Huth --- 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 18 09:30:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 704044 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e4d:0:b0:314:25da:8dc4 with SMTP id r13csp1430165wrt; Tue, 18 Jul 2023 02:32:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlG8K4YKpEVrT1rbseRdbrNWPbCwKfhXkCu78rdENTJSVY4+b6gsleb8O67jDNGHtpWxR88b X-Received: by 2002:ac8:570e:0:b0:401:de1a:6c1f with SMTP id 14-20020ac8570e000000b00401de1a6c1fmr19952423qtw.5.1689672760449; Tue, 18 Jul 2023 02:32:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689672760; cv=none; d=google.com; s=arc-20160816; b=WGAuS7YZ8bg9lsMvy0vTkZCZVF9kkSzAA4rzokGCYA8azxZ3oeqeSj8yfdBc7Ck0Fd u4Lq68JIwrbGgo1md3kVolah8uH2WJywwb//B0q1VFEyu6yFFyKNnq4SOJOdG9wHoeSo o19V2c6WH42yEhiiJ9v6vbauzYQVFQNQFLuO0hshCBVpnTVeAp6QissH7X8K/NOQUxuK 1hbQIbXKrrKtmxRqraWU2Ty3WW8isltuEwS5ZDedZL5k/DSjTrxuZFeSFKq7XmWO3nZt AmxmFAaZmbWhTeMwvJL9BG6vPluHUGcEj9/gNLgguYJfgnQTfcDfD3kpiQxleDdieDfI ymsA== 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=k9hlZtbmHrNPWro4lit4wkX521HorupWbjPTdtpUrEk=; fh=z8jmayWjiqRYuf6psS5INV4+U6uaCBaj2xXYu45eA64=; b=YrwDFu53FSA+VBTpCpadyhKw7N3nqmooFASiiGdp02hnJaIn9hB3isy2ezfIac6YWF 64xG2nUh/B/3NQq8H/oOIrncvvGEEzVFaGG1B+8rxSrkCs1krCmjHeTDhK0gN/fs2Z+L gKeXrL/qGUGNS/Pc+XNPtGW6w1Y1ZGOo9Oh4oMyykuvDPQMqqOdljB/tqILxgDp9LVGD sugW1zQIk8YrYAthHN1gdldQmI+H411a3NaeCaQ05VhjzCeZWjPPbVzGqoB3CgSJ1p26 P3InnUsNTJlxNfA9EiMVMmhWAjm/6vUb6zw7FaF0dVcudeHIkeDErmU8oYU3hytkwmIp rUPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=EWtujGCO; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y10-20020a05622a004a00b00403e841673bsi846978qtw.409.2023.07.18.02.32.40 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jul 2023 02:32:40 -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=@redhat.com header.s=mimecast20190719 header.b=EWtujGCO; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLh2p-00044l-HL; Tue, 18 Jul 2023 05:30:59 -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 1qLh2l-000412-8R for qemu-devel@nongnu.org; Tue, 18 Jul 2023 05:30:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLh2j-0004EX-S9 for qemu-devel@nongnu.org; Tue, 18 Jul 2023 05:30:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689672652; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k9hlZtbmHrNPWro4lit4wkX521HorupWbjPTdtpUrEk=; b=EWtujGCOIzrtHdggkhjsifVigfFl25AivStNf1b2y0PP2bFtIvPuHH5mdwnKeGLIBS956j wHsZvbgHkyQTbJy5c6wLnEwl5un5FqxlnHExMX7eUp2ciHj6yLxbmh2GMiDZP3WR9hfG9f b8Bdd22ZSHBgU61CotwDAFPw1VVKUO0= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-380-Xf4-ufvGP3-UVSSZfMg6Fw-1; Tue, 18 Jul 2023 05:30:49 -0400 X-MC-Unique: Xf4-ufvGP3-UVSSZfMg6Fw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 88E383C13927; Tue, 18 Jul 2023 09:30:49 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 922112166B25; Tue, 18 Jul 2023 09:30:48 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 5/8] tests/lcitool: Refresh generated files Date: Tue, 18 Jul 2023 11:30:37 +0200 Message-Id: <20230718093040.172145-6-thuth@redhat.com> In-Reply-To: <20230718093040.172145-1-thuth@redhat.com> References: <20230718093040.172145-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 From: Philippe Mathieu-Daudé Refresh the generated files by running: $ make lcitool-refresh Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230711144922.67491-3-philmd@linaro.org> Reviewed-by: Daniel P. Berrangé [thuth: Drop changes to libpmem-dev and libxen-dev] Signed-off-by: Thomas Huth --- tests/vm/generated/freebsd.json | 77 +++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 tests/vm/generated/freebsd.json 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 18 09:30:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 704043 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e4d:0:b0:314:25da:8dc4 with SMTP id r13csp1430030wrt; Tue, 18 Jul 2023 02:32:18 -0700 (PDT) X-Google-Smtp-Source: APBJJlEihR0zgYcngfHu7iO3PaqsxftgaAszJHP5wReOPTUCpGdJYHAf68a2R7s39okP9GrfoilE X-Received: by 2002:a05:620a:17a6:b0:768:75c:a323 with SMTP id ay38-20020a05620a17a600b00768075ca323mr13248373qkb.30.1689672738477; Tue, 18 Jul 2023 02:32:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689672738; cv=none; d=google.com; s=arc-20160816; b=v7pUgKcyPVrV6vsJtl+jHZJz5Ox2adBLdJpiS7qhCvyp/kUrOKAsFlJ90he9e0xUGk OfANjrGpCr+BV+u9Xj/pmGbvNvU6nLP1uf6sgjfqrG5pylA0mHVPT+m0AjSHpsNwBrbU gvG+pkxbSDshOpRvNDeIsAVm0OY6NswgCnCZG6leNBEz1tJHl35esaQNDiPaRooMlyHO G9pqieO/4p5a6nU1kSaHkVzObq4trFxJf9lXBAuKSTPvev9Bh07CC3z9yyY/KbFPsFuk GHNnyz+yDBz++rxlqrNra29z+wwSKrwVj48auBhsjOBZoCauU6fueymONnQ5oBYp4Yla N1bw== 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=zHSH2f6sNdUL3OXSLvMYszb1rthfkO1fWtFRariBUVA=; fh=z8jmayWjiqRYuf6psS5INV4+U6uaCBaj2xXYu45eA64=; b=foV/4Su8UVnJHTsuh+XDXYkZmIlsAcQ5L2lrZZyNdhlXj0jXUX137BkUTs4Ly8yHSu 0XuCWECYFjrSeRRRtj2K+MAN3ymbyl1XHQJIUfLFuHfzrn8/Bi9gUtHcM89x22VzMNbZ m2GppnsOSo7WXWROIqQnolIuifKQsqWVkUtQovPB8SDd/xfyRJQUq/v7UlQXYcr9RdcQ SlerE1se/uZs4UIXDhBCy2z+OdJPLHxMLEKHaPFGKIoJllzy+lR7pZiG+rxbJhk2tFRo om9XUFVe2F8AHXgJzjUqN3DfBomyoNVsYGCLCm6I/l+gXwbOKhBi7FlEZ4BCHdU0aLXD D+3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=LecodnJg; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id gs9-20020a056214226900b006375e2a280asi1027696qvb.178.2023.07.18.02.32.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jul 2023 02:32: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=@redhat.com header.s=mimecast20190719 header.b=LecodnJg; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLh2o-00042c-Fw; Tue, 18 Jul 2023 05:30:58 -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 1qLh2m-00041m-MK for qemu-devel@nongnu.org; Tue, 18 Jul 2023 05:30:56 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLh2l-0004F4-By for qemu-devel@nongnu.org; Tue, 18 Jul 2023 05:30:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689672654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zHSH2f6sNdUL3OXSLvMYszb1rthfkO1fWtFRariBUVA=; b=LecodnJgV7BL/Nsr+Xqf6v9x0wH/K4hTW77FiHfv7HcPPBNdTMmP74F+ZSg5I3WTrGjKqB x85y7tHvKYML4Hw4yrHdBb8H64Ons/ocLArr145TY98Xdq0ttDDMMF50+l/UxGZxC2G8IC 8LO2HPDHAOjSOR/Ar2goTvTXsWP5Ie0= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-479-1NP3Kue-NDSFO3gg-_bjBg-1; Tue, 18 Jul 2023 05:30:51 -0400 X-MC-Unique: 1NP3Kue-NDSFO3gg-_bjBg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C94202A59542; Tue, 18 Jul 2023 09:30:50 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id D424D2166B25; Tue, 18 Jul 2023 09:30:49 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 6/8] tests/vm: Introduce get_qemu_packages_from_lcitool_json() helper Date: Tue, 18 Jul 2023 11:30:38 +0200 Message-Id: <20230718093040.172145-7-thuth@redhat.com> In-Reply-To: <20230718093040.172145-1-thuth@redhat.com> References: <20230718093040.172145-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 From: Philippe Mathieu-Daudé 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é Message-Id: <20230711144922.67491-4-philmd@linaro.org> Signed-off-by: Thomas Huth --- 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 18 09:30:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 704042 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e4d:0:b0:314:25da:8dc4 with SMTP id r13csp1429966wrt; Tue, 18 Jul 2023 02:32:08 -0700 (PDT) X-Google-Smtp-Source: APBJJlE3xLE7rASbA4X/ahUCpK2r6D3bPiCWG3meEZ2dwt4rgAkBPvr2OoK8VuwT3knya9xLt1CQ X-Received: by 2002:a05:620a:8805:b0:767:5689:bc7a with SMTP id qj5-20020a05620a880500b007675689bc7amr14528210qkn.25.1689672728669; Tue, 18 Jul 2023 02:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689672728; cv=none; d=google.com; s=arc-20160816; b=ePwP8Lu11uq3XJYQLJT0FF5eDXjBir17v8CKKmm9QE130PMI5AYfY1meCbdbhdH9ak Aw1SJb6ilOOVmx/8EzbWLiiui2jbQUkGTObLVC7cR2bBjhGVueB5CoZc1jSxE/XYOnyP L3OLCV/3KBAUR0Bx6cEkEMjmsazdVSJN5/JqG6pgHjzqnoqKUIZ+WaxGJQ6WoC/0LuWk uF2RuGgAYBsJv1VYxfZF1GMchmh1DnkV+fbKty+2BJfZboVcnoz5sJH6sUY0bnOC8SIo FoohajATXExk9yK7Wbqsg5mssLnC4QPT+vNm5DrSHuqUJ1f5mIMOHxoQQOUdXOTXK8/W KaWg== 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=10Hf9TvKlJRB2JDOPZ02jBkzxfqVji3pOM00MBYZzzw=; fh=z8jmayWjiqRYuf6psS5INV4+U6uaCBaj2xXYu45eA64=; b=Flft8yC6+OhU+Q7wHpsy64nwaBtB8FpTMcjtkMjfz4hrLUHJlFGSq6nvNhrNlVL8rt lCd1zWfgADA9OaDrYWz6ljcL4OwJ8eQjZAxbt48ArxGoaeQGWNUUQsIM0n/PJsNkU+AJ Ym7EZYUqghtm+Hn6hbOFRk5PRG95nRYNUbeEZNpy6wljPfdov1jfaW5pkaXyDMGFiCTJ 1L23DWLJeosHur3E69K5klaHpcUAoFO8YcQhJZUB95L2JHyRw2jcYPzCObk3bPVjN9tC NhusF7s1dSMAurFLr+gQC0EzakTD0yprZYwaJbzbBUihuDrulKcO3qSymW5D/BlpZ+u+ ekdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PgUXitdI; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d8-20020a05620a140800b00767f1e65e25si727115qkj.471.2023.07.18.02.32.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Jul 2023 02:32:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PgUXitdI; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLh2r-000452-Nw; Tue, 18 Jul 2023 05:31:02 -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 1qLh2p-00043s-3N for qemu-devel@nongnu.org; Tue, 18 Jul 2023 05:30:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLh2m-0004FQ-Gr for qemu-devel@nongnu.org; Tue, 18 Jul 2023 05:30:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689672655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=10Hf9TvKlJRB2JDOPZ02jBkzxfqVji3pOM00MBYZzzw=; b=PgUXitdI614OMh1JvFPCBEVudaDiUIKm4/VqwTmDvGR+ZJwOLd05suA1t6VqfUPT2eSeUR MHQI/6rB6fvq8rPYuN8qLvsCcVVoivuFkgDBNOmg6nmB3J8SJoqqUu02MTBa8P49CvY4Y+ qmPWJwsjbnLx2VV1X4gCyn2dOESItRw= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-6-ueNHjiWHNzW0QdLTtlqOhQ-1; Tue, 18 Jul 2023 05:30:52 -0400 X-MC-Unique: ueNHjiWHNzW0QdLTtlqOhQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1C26A3C13920; Tue, 18 Jul 2023 09:30:52 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2147F2166B25; Tue, 18 Jul 2023 09:30:50 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Richard Henderson Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?D?= =?utf-8?q?aniel_P_=2E_Berrang=C3=A9?= Subject: [PULL 7/8] tests/vm/freebsd: Get up-to-date package list from lcitool vars file Date: Tue, 18 Jul 2023 11:30:39 +0200 Message-Id: <20230718093040.172145-8-thuth@redhat.com> In-Reply-To: <20230718093040.172145-1-thuth@redhat.com> References: <20230718093040.172145-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 From: Philippe Mathieu-Daudé Get an up-to-date package list from lcitool, that way we don't need to manually keep this array in sync. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Inspired-by: Thomas Huth Message-Id: <20230711144922.67491-5-philmd@linaro.org> Signed-off-by: Thomas Huth --- 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)