[jenkins-ci PATCH 6/8] lcitool: Add RPM-specific _dockerfile_build_varmap() variant

Andrea Bolognani abologna at redhat.com
Mon Feb 10 17:18:15 UTC 2020


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 <abologna at redhat.com>
---
 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()
 
     def _dockerfile_build_varmap(self, facts, mappings, pip_mappings, projects, cross_arch):
+        if facts["package_format"] == "deb":
+            return self._dockerfile_build_varmap_deb(facts, mappings, pip_mappings, projects, cross_arch)
+        if facts["package_format"] == "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 = facts["package_format"]
         package_manager = facts["package_manager"]
         os_name = facts["os_name"]
@@ -695,7 +701,7 @@ class Application:
         varmap["package_manager"] = package_manager
         varmap["pkgs"] = pkg_align[1:] + pkg_align.join(sorted(set(pkgs.values())))
 
-        if package_format == "deb" and cross_arch:
+        if cross_arch:
             deb_arch = Util.native_arch_to_deb_arch(cross_arch)
             abi = Util.native_arch_to_abi(cross_arch)
             lib = Util.native_arch_to_lib(cross_arch)
@@ -712,6 +718,46 @@ class Application:
 
         return varmap
 
+    def _dockerfile_build_varmap_rpm(self, facts, mappings, pip_mappings, projects, cross_arch):
+        package_format = facts["package_format"]
+        package_manager = facts["package_manager"]
+        os_name = facts["os_name"]
+        os_version = facts["os_version"]
+        os_full = os_name + os_version
+
+        pkgs = {}
+        pip_pkgs = {}
+        keys = ["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] = mappings[package][key]
+                    if package in pip_mappings and key in pip_mappings[package]:
+                        pip_pkgs[package] = 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 = " \\\n" + (" " * len("RUN " + package_manager + " "))
+        pip_pkg_align = " \\\n" + (" " * len("RUN pip3 "))
+
+        varmap = {}
+        varmap["package_manager"] = package_manager
+        varmap["pkgs"] = pkg_align[1:] + pkg_align.join(sorted(set(pkgs.values())))
+
+        if pip_pkgs:
+            varmap["pip_pkgs"] = 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 = facts["package_format"]
         package_manager = facts["package_manager"]
-- 
2.24.1




More information about the libvir-list mailing list