[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 22/25] tests/docker: auto-generate ubuntu1804 with lcitool
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v2 22/25] tests/docker: auto-generate ubuntu1804 with lcitool |
Date: |
Thu, 14 Jan 2021 14:39:57 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 |
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!
- [PATCH v2 15/25] tests/docker: expand fedora package list, (continued)
- [PATCH v2 15/25] tests/docker: expand fedora package list, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 19/25] tests/docker: auto-generate centos7 with lcitool, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 21/25] tests/docker: auto-generate fedora with lcitool, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 18/25] tests/docker: expand opensuse-leap package list, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 22/25] tests/docker: auto-generate ubuntu1804 with lcitool, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 23/25] tests/docker: auto-generate ubuntu2004 with lcitool, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 24/25] tests/docker: auto-generate opensuse-leap with lcitool, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 25/25] tests/docker: remove ubuntu container, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 17/25] tests/docker: expand ubuntu2004 package list, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 14/25] tests/docker: expand centos8 package list, Daniel P . Berrangé, 2021/01/14
- [PATCH v2 03/25] tests/docker: use project specific container registries, Daniel P . Berrangé, 2021/01/14