Re: [PATCH v2 22/25] tests/docker: auto-generate ubuntu1804 with lcitool

[Philippe Mathieu-Daudé]

On 1/14/21 2:02 PM, Daniel P. Berrangé wrote:
> This commit is best examined using the "-b" option to diff.
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  tests/docker/dockerfiles/refresh           |   6 +
>  tests/docker/dockerfiles/ubuntu1804.docker | 235 +++++++++++----------
>  2 files changed, 135 insertions(+), 106 deletions(-)
> 
> diff --git a/tests/docker/dockerfiles/refresh 
> b/tests/docker/dockerfiles/refresh
> index bc7d8dd5f0..ab1d00fcf8 100755
> --- a/tests/docker/dockerfiles/refresh
> +++ b/tests/docker/dockerfiles/refresh
> @@ -51,5 +51,11 @@ try:
>     generate_image("centos7.docker", "centos-7")
>     generate_image("centos8.docker", "centos-8")
>     generate_image("fedora.docker", "fedora-32")
> +
> +   skipssh = ["# https://bugs.launchpad.net/qemu/+bug/1838763\n";,
> +              "ENV QEMU_CONFIGURE_OPTS --disable-libssh\n"]
> +
> +   generate_image("ubuntu1804.docker", "ubuntu-1804",
> +                  trailer="".join(skipssh))
...

>  # https://bugs.launchpad.net/qemu/+bug/1838763
>  ENV QEMU_CONFIGURE_OPTS --disable-libssh
> 

I forgot to mention, the 'trailer' argument feature is very nice!