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

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

[Thomas Huth]

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>
---
 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))
-- 
2.27.0

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

[Thomas Huth]

Please ignore the "2/2" in the subject, this is meant to be a standalone patch.

  Thomas


On 01/02/2022 11.19, Thomas Huth wrote:
> 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>
> ---
>   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))

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

[Philippe Mathieu-Daudé via]

On 2/1/22 11:19, Thomas Huth wrote:
> Support for CentOS 8 has stopped at the end of 2021, so let's
> switch to the Stream variant instead.

"Run 'make lcitool-refresh' to update the generated centos8.docker."

> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  tests/docker/dockerfiles/centos8.docker | 4 ++--
>  tests/lcitool/refresh                   | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

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>

Queued to testing/next, thanks.

-- 
Alex Bennée

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

[Andrea Bolognani]

On Tue, Feb 01, 2022 at 11:19:11AM +0100, Thomas Huth wrote:
> +++ 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
[...]
> +++ b/tests/lcitool/refresh
> @@ -77,7 +77,7 @@ ubuntu2004_tsanhack = [
>  ]
>
>  try:
> -   generate_dockerfile("centos8", "centos-8")
> +   generate_dockerfile("centos8", "centos-stream-8")

I'm not convinced this is a good idea.

CentOS 8 and CentOS Stream 8 are two pretty distinct operating
systems in terms of update cadence and stability expectations, so I
think that using the label "centos8" for containers and CI jobs that
are actually consuming CentOS Stream 8 is going to be a source of
confusion.

I recommend proceeding with a thorough rename, after which the string
"centos8" no longer shows up anywhere, instead.

-- 
Andrea Bolognani / Red Hat / Virtualization

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

[Alex Bennée]

Andrea Bolognani <abologna@redhat.com> writes:

> On Tue, Feb 01, 2022 at 11:19:11AM +0100, Thomas Huth wrote:
>> +++ 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
> [...]
>> +++ b/tests/lcitool/refresh
>> @@ -77,7 +77,7 @@ ubuntu2004_tsanhack = [
>>  ]
>>
>>  try:
>> -   generate_dockerfile("centos8", "centos-8")
>> +   generate_dockerfile("centos8", "centos-stream-8")
>
> I'm not convinced this is a good idea.
>
> CentOS 8 and CentOS Stream 8 are two pretty distinct operating
> systems in terms of update cadence and stability expectations, so I
> think that using the label "centos8" for containers and CI jobs that
> are actually consuming CentOS Stream 8 is going to be a source of
> confusion.
>
> I recommend proceeding with a thorough rename, after which the string
> "centos8" no longer shows up anywhere, instead.

Thomas do you agree? Should I drop the patch in favour or a new version
with a more extensive rename?

-- 
Alex Bennée

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

[Philippe Mathieu-Daudé via]

On 1/2/22 18:35, Alex Bennée wrote:
> 
> Andrea Bolognani <abologna@redhat.com> writes:
> 
>> On Tue, Feb 01, 2022 at 11:19:11AM +0100, Thomas Huth wrote:
>>> +++ 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
>> [...]
>>> +++ b/tests/lcitool/refresh
>>> @@ -77,7 +77,7 @@ ubuntu2004_tsanhack = [
>>>   ]
>>>
>>>   try:
>>> -   generate_dockerfile("centos8", "centos-8")
>>> +   generate_dockerfile("centos8", "centos-stream-8")
>>
>> I'm not convinced this is a good idea.
>>
>> CentOS 8 and CentOS Stream 8 are two pretty distinct operating
>> systems in terms of update cadence and stability expectations, so I
>> think that using the label "centos8" for containers and CI jobs that
>> are actually consuming CentOS Stream 8 is going to be a source of
>> confusion.
>>
>> I recommend proceeding with a thorough rename, after which the string
>> "centos8" no longer shows up anywhere, instead.
> 
> Thomas do you agree? Should I drop the patch in favour or a new version
> with a more extensive rename?

I agree with Andrea :)

Andrea, do you think it is acceptable to merge this and fix on top, or
we should do it properly from start?

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

[Andrea Bolognani]

On Tue, Feb 01, 2022 at 06:47:14PM +0100, Philippe Mathieu-Daudé wrote:
> Andrea, do you think it is acceptable to merge this and fix on top, or
> we should do it properly from start?

My preference is always to avoid follow-up tweaks if possible :) but
ultimately the decision is up to the QEMU developers and maintainers.

-- 
Andrea Bolognani / Red Hat / Virtualization

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

[Thomas Huth]

On 01/02/2022 19.34, Andrea Bolognani wrote:
> On Tue, Feb 01, 2022 at 06:47:14PM +0100, Philippe Mathieu-Daudé wrote:
>> Andrea, do you think it is acceptable to merge this and fix on top, or
>> we should do it properly from start?
> 
> My preference is always to avoid follow-up tweaks if possible :) but
> ultimately the decision is up to the QEMU developers and maintainers.

I really wouldn't mind if we simply re-use the old name, but if the 
consensus here is that we should rename it, I think I'm with Andrea, then 
let's rather rename it properly right from the start.

  Thomas

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

[Daniel P. Berrangé]

On Tue, Feb 01, 2022 at 09:08:22AM -0800, Andrea Bolognani wrote:
> On Tue, Feb 01, 2022 at 11:19:11AM +0100, Thomas Huth wrote:
> > +++ 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
> [...]
> > +++ b/tests/lcitool/refresh
> > @@ -77,7 +77,7 @@ ubuntu2004_tsanhack = [
> >  ]
> >
> >  try:
> > -   generate_dockerfile("centos8", "centos-8")
> > +   generate_dockerfile("centos8", "centos-stream-8")
> 
> I'm not convinced this is a good idea.
> 
> CentOS 8 and CentOS Stream 8 are two pretty distinct operating
> systems in terms of update cadence and stability expectations, so I
> think that using the label "centos8" for containers and CI jobs that
> are actually consuming CentOS Stream 8 is going to be a source of
> confusion.

Given the EOL of what I call the "traditional" CentOS model at the
end of 2021, both "CentOS" and "CentOS Stream" terms effectively
mean the same thing now.

If we were trying to support CI for both traditional CentOS and
CentOS Stream at the same time, then using the distinct naming
is sensible.  libvirt-ci.git is in this situation

Since QEMU should only care about CentOS Stream from this point
forwards, then I don't think we neccesarily[1] need to make the
naming more verbose by adding the word 'stream' everywhere.

The caveat is that aside from this dockerfile, we also have a
VM config in test/vm/ that historically used traditional CentOS.
That may also need updating to point to Stream unless it has
seemlessly transitioned to using Stream content without us
needing to change anything. I've not looked closely at that yet.

Regards,
Daniel

[1] what would make me change my mind is if we renamed all the
    QEMU dockerfiles so use the same distro naming convention
    as libvirt-ci.git rather than having QEMU's own naming. I've
    thought about suggesting it but it wasn't a high priority
    since lcitool usage is in its infancy in QEMU still
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

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

[Andrea Bolognani]

On Tue, Feb 01, 2022 at 06:02:21PM +0000, Daniel P. Berrangé wrote:
> On Tue, Feb 01, 2022 at 09:08:22AM -0800, Andrea Bolognani wrote:
> > CentOS 8 and CentOS Stream 8 are two pretty distinct operating
> > systems in terms of update cadence and stability expectations, so I
> > think that using the label "centos8" for containers and CI jobs that
> > are actually consuming CentOS Stream 8 is going to be a source of
> > confusion.
>
> Given the EOL of what I call the "traditional" CentOS model at the
> end of 2021, both "CentOS" and "CentOS Stream" terms effectively
> mean the same thing now.

Note that while CentOS 7 is no longer targeted by QEMU, it still is
very much relevant as an OS and will keep receiving updates for ~2.5
more years.

> The caveat is that aside from this dockerfile, we also have a
> VM config in test/vm/ that historically used traditional CentOS.
> That may also need updating to point to Stream unless it has
> seemlessly transitioned to using Stream content without us
> needing to change anything. I've not looked closely at that yet.

This example IMO only highlights the need for names to match reality
and why overloading existing names is a bad idea.

-- 
Andrea Bolognani / Red Hat / Virtualization

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