[libvirt] [jenkins-ci PATCH v2 5/8] guests: Install EPEL repo on all CentOS guests

Fabiano Fidêncio fidencio at redhat.com
Wed Dec 11 12:25:13 UTC 2019


On Wed, Dec 11, 2019 at 10:44 AM Fabiano Fidêncio <fidencio at redhat.com> wrote:
>
> On Wed, Dec 11, 2019 at 10:31 AM Andrea Bolognani <abologna at redhat.com> wrote:
> >
> > On Tue, 2019-12-10 at 16:38 +0100, Fabiano Fidêncio wrote:
> > > +++ b/guests/playbooks/update/tasks/base.yml
> > > @@ -15,7 +15,6 @@
> > >      state: latest
> > >    when:
> > >      - os_name == 'CentOS'
> > > -    - os_version == '7'
> >
> > Welp, I just realized you need to apply the same change to the
> > _action_dockerfile() function in lcitool too... Up to you whether
> > to respin or fix Dockerfile generation in a follow-up patch.
>
> I will respin the series as it may need an extra patch between those
> this one and the PowerTools one.

Actually, I will not.

This is the fixup for this patch:
```
diff --git a/guests/lcitool b/guests/lcitool
index 803477e..059b789 100755
--- a/guests/lcitool
+++ b/guests/lcitool
@@ -748,7 +748,7 @@ class Application:
                         {package_manager} autoremove -y && \\
                         {package_manager} clean all -y
                 """).format(**varmap))
-            elif os_name == "CentOS" and os_version == "7":
+            elif os_name == "CentOS":
                 sys.stdout.write(textwrap.dedent("""
                     RUN {package_manager} update -y && \\
                         {package_manager} install -y epel-release && \\
```
Best Regards,
-- 
Fabiano Fidêncio





More information about the libvir-list mailing list