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)