Re: [jenkins-ci PATCH v2 6/8] guests: Enable PowerTools repo on CentOS 8 guests

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, Dec 11, 2019 at 10:32 AM Andrea Bolognani <abologna@xxxxxxxxxx> wrote:
>
> On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
> > +++ b/guests/playbooks/update/tasks/base.yml
> > +- name: Enable PowerTools repository
> > +  command: '{{ package_manager }} config-manager --set-enabled PowerTools -y'
> > +  args:
> > +    warn: no
> > +  when:
> > +    - os_name == 'CentOS'
> > +    - os_version == '8'
>
> Same comment as the one I just made for EPEL: you need to make sure
> this line ends up in the generated Dockerfile too.

And this is the fixup for this one:
```
diff --git a/guests/lcitool b/guests/lcitool
index 059b789..c28c414 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -749,13 +749,23 @@ class Application:
                         {package_manager} clean all -y
                 """).format(**varmap))
             elif os_name == "CentOS":
-                sys.stdout.write(textwrap.dedent("""
-                    RUN {package_manager} update -y && \\
-                        {package_manager} install -y epel-release && \\
-                        {package_manager} install -y {pkgs} && \\
-                        {package_manager} autoremove -y && \\
-                        {package_manager} clean all -y
-                """).format(**varmap))
+                if os_version == "7":
+                    sys.stdout.write(textwrap.dedent("""
+                        RUN {package_manager} update -y && \\
+                            {package_manager} install -y epel-release && \\
+                            {package_manager} install -y {pkgs} && \\
+                            {package_manager} autoremove -y && \\
+                            {package_manager} clean all -y
+                    """).format(**varmap))
+                else:
+                    sys.stdout.write(textwrap.dedent("""
+                        RUN {package_manager} update -y && \\
+                            {package_manager} config-manager
--set-enabled PowerTools -y && \\
+                            {package_manager} install -y epel-release && \\
+                            {package_manager} install -y {pkgs} && \\
+                            {package_manager} autoremove -y && \\
+                            {package_manager} clean all -y
+                    """).format(**varmap))
             else:
                 sys.stdout.write(textwrap.dedent("""
                     RUN {package_manager} update -y && \\

```
We (Andrea and I) agree that this function has to be ungrossified
sooner than later. But it'll be done in the future.

Best Regards,
-- 
Fabiano Fidêncio


--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux