Re: [PATCH 2/2] tests: Update CentOS 8 container to CentOS Stream 8

[Alex Bennée]

Thomas Huth <thuth@redhat.com> writes:

> Support for CentOS 8 has stopped at the end of 2021, so let's
> switch to the Stream variant instead.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Re-queued to testing/next, thanks. The existing centos8 image is now
broken and we can fix the naming later.

> ---
>  tests/docker/dockerfiles/centos8.docker | 4 ++--
>  tests/lcitool/refresh                   | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/centos8.docker 
> b/tests/docker/dockerfiles/centos8.docker
> index cbb909d02b..cf95cd4b4a 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -1,10 +1,10 @@
>  # THIS FILE WAS AUTO-GENERATED
>  #
> -#  $ lcitool dockerfile centos-8 qemu
> +#  $ lcitool dockerfile centos-stream-8 qemu
>  #
>  # https://gitlab.com/libvirt/libvirt-ci
>  
> -FROM docker.io/library/centos:8
> +FROM quay.io/centos/centos:stream8
>  
>  RUN dnf update -y && \
>      dnf install 'dnf-command(config-manager)' -y && \
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index 033120e223..30196ef3cd 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -77,7 +77,7 @@ ubuntu2004_tsanhack = [
>  ]
>  
>  try:
> -   generate_dockerfile("centos8", "centos-8")
> +   generate_dockerfile("centos8", "centos-stream-8")
>     generate_dockerfile("fedora", "fedora-35")
>     generate_dockerfile("ubuntu1804", "ubuntu-1804",
>                         trailer="".join(ubuntu1804_skipssh))


-- 
Alex Bennée