[libvirt PATCH 1/2] ci: introduce pygments package to install

Ján Tomko jtomko at redhat.com
Tue Sep 29 15:48:01 UTC 2020


On a Friday in 2020, Daniel P. Berrangé wrote:
>The pygments package is required by docutils when specifying a language
>for the "code-block" directive.
>
>Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
>---
> .gitlab-ci.yml                                              | 2 +-
> ci/cirrus/build.yml                                         | 6 ++++--
> ci/cirrus/libvirt-freebsd-11.vars                           | 5 ++---
> ci/cirrus/libvirt-freebsd-12.vars                           | 5 ++---
> ci/cirrus/libvirt-macos-1015.vars                           | 6 +++---
> ci/cirrus/refresh                                           | 2 +-
> ci/containers/libvirt-centos-7.Dockerfile                   | 1 +
> ci/containers/libvirt-centos-8.Dockerfile                   | 1 +
> ci/containers/libvirt-centos-stream.Dockerfile              | 1 +

[...]

> ci/containers/libvirt-ubuntu-1804.Dockerfile                | 1 +
> ci/containers/libvirt-ubuntu-2004.Dockerfile                | 1 +

IIUC the dockerfiles in libvirt repo are not be touched directly.
Instead, do the change in the libvirt-ci repo and
do a 'refresh agianst libvirt-ci commit XXX' in libvirt:
https://gitlab.com/libvirt/libvirt/-/blob/master/ci/containers/README.rst

> 36 files changed, 43 insertions(+), 13 deletions(-)
>
>diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>index ee404bf50a..e4af3303ee 100644
>--- a/.gitlab-ci.yml
>+++ b/.gitlab-ci.yml
>@@ -100,7 +100,7 @@ stages:
>           -e "s|[@]PKGS@|$PKGS|g"
>           -e "s|[@]MAKE@|$MAKE|g"
>           -e "s|[@]PYTHON@|$PYTHON|g"
>-          -e "s|[@]PIP@|$PIP|g"
>+          -e "s|[@]PIP3@|$PIP3|g"

Why the rename?

>           -e "s|[@]PYPI_PKGS@|$PYPI_PKGS|g"
>       <ci/cirrus/build.yml >ci/cirrus/$NAME.yml
>     - cat ci/cirrus/$NAME.yml

Jano
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20200929/9892d906/attachment-0001.sig>


More information about the libvir-list mailing list