From patchwork Wed May 31 20:09:06 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: 687300 Delivered-To: patch@linaro.org Received: by 2002:a5d:4d8a:0:0:0:0:0 with SMTP id b10csp1449278wru; Wed, 31 May 2023 13:09:55 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ64UJe3BuWB0n4RCaOKiXO6d1l7nxwiyxwPIul4wDoqx6UnsjVcdXDTEHD/p0rrdOrZrhsD X-Received: by 2002:ac8:57ce:0:b0:3ef:28dc:fdd0 with SMTP id w14-20020ac857ce000000b003ef28dcfdd0mr8438473qta.44.1685563795718; Wed, 31 May 2023 13:09:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685563795; cv=none; d=google.com; s=arc-20160816; b=xKP8Bc5k9/B8Ymf8qfxo8jimYP/YSO5HZJR5gNI53m162ynItMlOtqaB2WFFc2HVWe TvRm08LDWrXvcyOedlC/bMW5oCxGXmCXzB5rXpxlt+Ypa4H0tLYTETpu7lPgloN+jngb tXNqeHG8/fUzVxA7n4SUgvLGRww2uqEvdNiaaEtmgO3q9pW+kDxANbfIc8670xv+h8uT 0laCDyz1mUvnimvdbIsh/po8gxwWUHnzoNbslEXtSN0VP/Nr5FVB5DPvMql3zN6UMXp2 9IlElGbJlb/u9gesihirND1uMtygnQ54E8liFB0ekAyQy2tThxY3Pix2qFxy/BOQTJp6 5rqw== 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=ZuHFSUSInpdpLv4yrlAqMcIZx0noGMOR/r58BhLDlnk=; b=EOUb0R9bTarIQjpsQ4s8U9eP+C5t4DPQ00kvDR7xmCiexLKDn5s+HqyFiIf5Z8n7Tk Bv9zvEyAW4brikNL+MRCWZKPl/OeVcITl9RqRJjeEMQmNsdigRKH3wIgLsGdi6meY+cf PyL/yPYQgoNRgdOT1yisgmvJcXUQ2SZXDn67FYoxqWHZhjhQbICMjBG35cnPTrBLf1We PBtorc8YTDxZ3me/XzOfloIKO80rWD6CEcx6YrEnl6iWanRBCiXnfnQgZ3RGDmwUOMlI 5owBLHNIreDieDvVbEMCheIoHA4eRAmj2fFui9kpoEHErAS3KXkVs5zFgBBNeQjL5Tj6 GhJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kHEmulJz; 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 x16-20020ac85f10000000b003dfda8e2b48si8981998qta.106.2023.05.31.13.09.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 May 2023 13:09: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=@linaro.org header.s=google header.b=kHEmulJz; 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 1q4S8S-0005Zd-Ni; Wed, 31 May 2023 16:09:32 -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 1q4S8R-0005ZO-Tc for qemu-devel@nongnu.org; Wed, 31 May 2023 16:09:31 -0400 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 1q4S8Q-0006rI-03 for qemu-devel@nongnu.org; Wed, 31 May 2023 16:09:31 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-3f606a80d34so787435e9.0 for ; Wed, 31 May 2023 13:09:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685563768; x=1688155768; 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=ZuHFSUSInpdpLv4yrlAqMcIZx0noGMOR/r58BhLDlnk=; b=kHEmulJz7zguJPIb0tfqgna6W5xTT9unwp6HuqxHDUxC+w50keNoljGK2uVjB10YMV 7LGydJo6azlGAZ+bO+9B99w1ouIWY7EO0mSFSCCPHSPYr5FbD4c2m0n3W70HMACi9Coz 5P3IgTM2a/IHn0LXbz/6Ekj8RULPv/onoPuNuSA+udOg6CVhikZ5hkMzSHBtXdPF5uAD caPp5pTvgIrqESancQjhAIXbx3bb7muaTaF9aizJsRfa18JDZhF9ygtjopmFOJgeOcw/ m00OxxxzRxZ2jdXLJfGZfCkLJammY4G4mrR4TJ7ScOYzBQQG5xh949TSjB6KV5i51pwp o7pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685563768; x=1688155768; 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=ZuHFSUSInpdpLv4yrlAqMcIZx0noGMOR/r58BhLDlnk=; b=hmqaGQ7USyymkueeKayfvJsRFSq/Yk56nwj7giRT4RscTm8jZ2VkfLGE7YnKZhJlqy /6RhgDTJ96WddQLpuBUx1W66uAV+ZlywCJNjTruA60NH2v2Eho8AIxIlS41kOnr9ZnXk boRhGjKAHoQtuOklu9q4UC3xQlyOkxvwKycasBMz1ksxtfAHM9edEe2pS7XPD8aaOxfX t1vdI7eZ20jBvSeyPzz4S6fDkAeny+JVpe8iJrtkVtjQpHRRLsLSLN6XUEThtN0cyBlS 2i+YIEGxgj+qC33/4vkbj7bnaEl/Bs7iROXnvN7vE7bRTDc2trO+wOHgJm5pOyCev/Kj 2Icw== X-Gm-Message-State: AC+VfDw9AAAuoKGTAIVEsI+TkLRfa0N7krWxccx9yGUnoPJ/U5bN7WuY rtKe7UtrQ+OaRqOMwLkAQ1QqhQ== X-Received: by 2002:a05:600c:28c:b0:3f6:148f:5867 with SMTP id 12-20020a05600c028c00b003f6148f5867mr304334wmk.4.1685563768368; Wed, 31 May 2023 13:09:28 -0700 (PDT) Received: from localhost.localdomain ([176.176.146.12]) by smtp.gmail.com with ESMTPSA id u6-20020adfeb46000000b0030ae53550f5sm7736669wrn.51.2023.05.31.13.09.26 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 31 May 2023 13:09:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Thomas Huth , qemu-devel@nongnu.org Cc: Ed Maste , =?utf-8?q?Alex_Benn=C3=A9e?= , Kyle Evans , Li-Wen Hsu , Erik Skultety , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Dani?= =?utf-8?q?el_P_=2E_Berrang=C3=A9?= , Wainer dos Santos Moschetta , Beraldo Leal , Warner Losh Subject: [PATCH 3/3] tests/vm/freebsd: Get up-to-date package list from lcitool vars file Date: Wed, 31 May 2023 22:09:06 +0200 Message-Id: <20230531200906.17790-4-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230531200906.17790-1-philmd@linaro.org> References: <20230531200906.17790-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org See previous commit for rationale on using lcitool vars file to get an up-to-date package list. Since there is a such file generated for FreeBSD 13 available in the repository, use it. That way we don't need to manually keep this array in sync. Inspired-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- tests/vm/freebsd | 44 ++++---------------------------------------- 1 file changed, 4 insertions(+), 40 deletions(-) diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 6a0d7a4569..4f12878645 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -31,45 +31,7 @@ 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", - ] + lcitool_vars = ".gitlab-ci.d/cirrus/freebsd-13.vars" BUILD_SCRIPT = """ set -e; @@ -151,8 +113,10 @@ class FreeBSDVM(basevm.BaseVM): self.console_wait(prompt) self.console_send("echo 'chmod 666 /dev/vtbd1' >> /etc/rc.local\n") + vars_path = os.path.join(src_path, self.lcitool_vars) + pkgs = basevm.get_qemu_packages_from_lcitool_vars(vars_path) 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)