Re: [libvirt] [jenkins-ci PATCH v3 09/10] lcitool: avoid using an env var to store package list
On Wed, 2019-02-13 at 19:03 +0000, Daniel P. Berrangé wrote:
[...]
elif package_format == "rpm":
if os_name == "Fedora" and os_version == "Rawhide":
sys.stdout.write(textwrap.dedent("""
RUN yum update -y --nogpgcheck fedora-gpg-keys && \\
yum update -y && \\
- yum install -y ${PACKAGES} && \\
+ yum install -y %(pkgs)s && \\
You need to use '{pkgs}' instead of '%(pkgs)s' here, or substitution
will not be performed.
It should also be indented like
yum install -y \\
{pkgs} && \\
to avoid misalignment in the output file.
There's a bit of room for improvement (ideally the packages would be
aligned with "install" as they are in Debian) but we can deal with
that later.
yum autoremove -y && \\
yum clean all -y
- """))
+ """).format(**varmap))
else:
sys.stdout.write(textwrap.dedent("""
RUN yum update -y && \\
- yum install -y ${PACKAGES} && \\
+ yum install -y %(pkgs)s && \\
Same here.
With all of the above taken care of,
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
Can you please push the series up until this point right away? The
last patch needs some more discussion, but with these changes in I
can already refresh the existing native Dockerfiles and trigger a
build, which I'm very keen on doing sooner rather than later as the
existing images are fairly outdated by now.
--
Andrea Bolognani / Red Hat / Virtualization