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