From nobody Mon Feb 9 17:22:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 1581355147560274.9886759946405; Mon, 10 Feb 2020 09:19:07 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-407-OoVnHePIPUOc1ieuaHGD_A-1; Mon, 10 Feb 2020 12:18:57 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 780F7DB2C; Mon, 10 Feb 2020 17:18:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54E9A5DA84; Mon, 10 Feb 2020 17:18:51 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 17D99180880D; Mon, 10 Feb 2020 17:18:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 01AHIRhM028039 for ; Mon, 10 Feb 2020 12:18:27 -0500 Received: by smtp.corp.redhat.com (Postfix) id C819B5C28F; Mon, 10 Feb 2020 17:18:27 +0000 (UTC) Received: from kinshicho.usersys.redhat.com (unknown [10.43.2.246]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 515EE5C1D6 for ; Mon, 10 Feb 2020 17:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581355146; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=H+szaMIERroUwZyKA17Km26tAt9INz4S4N/O9Kl31uc=; b=JvfCusaMpcydJL9qRBzPbfmGiLBW6lI3v54FR/TOqB2L1aVMqrn9VEX0qJ8BJv3uQ+MMPn mzegHXOgkS9hWJMGTPhRLmsbd37eP8b5Nuu957kCZ3tEwAqdCbNIuSMvJFCIbg96zMriRh ygZCRl3Fu5OTOlJW/IBcnYbGz2IBPAw= From: Andrea Bolognani To: libvir-list@redhat.com Subject: [jenkins-ci PATCH 6/8] lcitool: Add RPM-specific _dockerfile_build_varmap() variant Date: Mon, 10 Feb 2020 18:18:15 +0100 Message-Id: <20200210171817.53126-7-abologna@redhat.com> In-Reply-To: <20200210171817.53126-1-abologna@redhat.com> References: <20200210171817.53126-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: OoVnHePIPUOc1ieuaHGD_A-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" A lot of the code in _dockerfile_build_varmap() only applies to Debian, so we can have a simpler version for use with Fedora. This split will come in handy later on, when we start introducing features that work in Fedora and not in Debian. Signed-off-by: Andrea Bolognani --- guests/lcitool | 48 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/guests/lcitool b/guests/lcitool index 82e98c5..37a0253 100755 --- a/guests/lcitool +++ b/guests/lcitool @@ -643,6 +643,12 @@ class Application: return r.read().rstrip() =20 def _dockerfile_build_varmap(self, facts, mappings, pip_mappings, proj= ects, cross_arch): + if facts["package_format"] =3D=3D "deb": + return self._dockerfile_build_varmap_deb(facts, mappings, pip_= mappings, projects, cross_arch) + if facts["package_format"] =3D=3D "rpm": + return self._dockerfile_build_varmap_rpm(facts, mappings, pip_= mappings, projects, cross_arch) + + def _dockerfile_build_varmap_deb(self, facts, mappings, pip_mappings, = projects, cross_arch): package_format =3D facts["package_format"] package_manager =3D facts["package_manager"] os_name =3D facts["os_name"] @@ -695,7 +701,7 @@ class Application: varmap["package_manager"] =3D package_manager varmap["pkgs"] =3D pkg_align[1:] + pkg_align.join(sorted(set(pkgs.= values()))) =20 - if package_format =3D=3D "deb" and cross_arch: + if cross_arch: deb_arch =3D Util.native_arch_to_deb_arch(cross_arch) abi =3D Util.native_arch_to_abi(cross_arch) lib =3D Util.native_arch_to_lib(cross_arch) @@ -712,6 +718,46 @@ class Application: =20 return varmap =20 + def _dockerfile_build_varmap_rpm(self, facts, mappings, pip_mappings, = projects, cross_arch): + package_format =3D facts["package_format"] + package_manager =3D facts["package_manager"] + os_name =3D facts["os_name"] + os_version =3D facts["os_version"] + os_full =3D os_name + os_version + + pkgs =3D {} + pip_pkgs =3D {} + keys =3D ["default", package_format, os_name, os_full] + + # We need to add the base project manually here: the standard + # machinery hides it because it's an implementation detail + for project in projects + ["base"]: + for package in self._projects.get_packages(project): + for key in keys: + if key in mappings[package]: + pkgs[package] =3D mappings[package][key] + if package in pip_mappings and key in pip_mappings[pac= kage]: + pip_pkgs[package] =3D pip_mappings[package][key] + + if package not in pkgs: + continue + if package in pip_pkgs and pkgs[package] is not None: + del pip_pkgs[package] + if pkgs[package] is None: + del pkgs[package] + + pkg_align =3D " \\\n" + (" " * len("RUN " + package_manager + " ")) + pip_pkg_align =3D " \\\n" + (" " * len("RUN pip3 ")) + + varmap =3D {} + varmap["package_manager"] =3D package_manager + varmap["pkgs"] =3D pkg_align[1:] + pkg_align.join(sorted(set(pkgs.= values()))) + + if pip_pkgs: + varmap["pip_pkgs"] =3D pip_pkg_align[1:] + pip_pkg_align.join(= sorted(set(pip_pkgs.values()))) + + return varmap + def _dockerfile_format(self, facts, cross_arch, varmap): package_format =3D facts["package_format"] package_manager =3D facts["package_manager"] --=20 2.24.1