[libvirt] [jenkins-ci PATCH 5/5] lcitool: Make Dockerfile generation work on openSUSE

Andrea Bolognani abologna at redhat.com
Thu Dec 12 14:31:08 UTC 2019


We can't use the same command sequence as for CentOS and Fedora.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 guests/lcitool | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/guests/lcitool b/guests/lcitool
index 9958508..d862282 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -767,10 +767,20 @@ class Application:
             commands.extend([
                 "{package_manager} update -y",
                 "{package_manager} install -y {pkgs}",
-                "{package_manager} autoremove -y",
-                "{package_manager} clean all -y",
             ])
 
+            # openSUSE doesn't seem to have a convenient way to remove all
+            # unnecessary packages, but CentOS and Fedora do
+            if os_name == "OpenSUSE":
+                commands.extend([
+                    "{package_manager} clean --all",
+                ])
+            else:
+                commands.extend([
+                    "{package_manager} autoremove -y",
+                    "{package_manager} clean all -y",
+                ])
+
             script = "\nRUN " + (" && \\\n    ".join(commands)) + "\n"
 
             sys.stdout.write(script.format(**varmap))
-- 
2.23.0




More information about the libvir-list mailing list