Re: [PULL 15/28] tests: Update CentOS 8 container to CentOS Stream 8

[Philippe Mathieu-Daudé]

Hi Thomas,

On 9/2/22 15:15, Alex Bennée wrote:
> From: Thomas Huth <thuth@redhat.com>
>
> 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>
> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> Message-Id: <20220201101911.97900-1-thuth@redhat.com>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> Message-Id: <20220204204335.1689602-16-alex.bennee@linaro.org>
>
> diff --git a/tests/docker/dockerfiles/centos8.docker 
> b/tests/docker/dockerfiles/centos8.docker
> index 3abac7a8b1..3ede55d09b 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -1,10 +1,10 @@
>   # THIS FILE WAS AUTO-GENERATED
>   #
> -#  $ lcitool dockerfile --layers all centos-8 qemu
> +#  $ lcitool dockerfile --layers all 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 25301f2ef0..4ab90a310a 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))

I don't understand, I don't get the same output.

This hunk is missing:
20220211163434.58423-2-f4bug@amsat.org/">https://lore.kernel.org/qemu-devel/20220211163434.58423-2-f4bug@amsat.org/

Should we add a gitlab job that runs 'make lcitool-refresh' and
fails if tests/docker/dockerfiles/ mismatch?