[PATCH] tests: update for rename of CentOS8 PowerTools repo

[PATCH] tests: update for rename of CentOS8 PowerTools repo

[Daniel P. Berrangé]

This was intentionally renamed recently to be all lowercase:

https://bugs.centos.org/view.php?id=17920
https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

This needs to be merged asap, as CI will break for anyone whose branch
triggers a rebuild of the centos container image.

eg current broken git master:

  https://gitlab.com/berrange/qemu/-/jobs/915852165

vs with this fix

  https://gitlab.com/berrange/qemu/-/jobs/915862731

 tests/docker/dockerfiles/centos8.docker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
index 54bc6d54cd..06b67962fd 100644
--- a/tests/docker/dockerfiles/centos8.docker
+++ b/tests/docker/dockerfiles/centos8.docker
@@ -31,6 +31,6 @@ ENV PACKAGES \
     zlib-devel
 
 RUN dnf install -y dnf-plugins-core && \
-  dnf config-manager --set-enabled PowerTools && \
+  dnf config-manager --set-enabled powertools && \
   dnf install -y $PACKAGES
 RUN rpm -q $PACKAGES | sort > /packages.txt
-- 
2.29.2

Re: [PATCH] tests: update for rename of CentOS8 PowerTools repo

[Willian Rampazzo]

On Wed, Dec 16, 2020 at 11:21 AM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> This was intentionally renamed recently to be all lowercase:
>
> https://bugs.centos.org/view.php?id=17920
> https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>
> This needs to be merged asap, as CI will break for anyone whose branch
> triggers a rebuild of the centos container image.
>
> eg current broken git master:
>
>   https://gitlab.com/berrange/qemu/-/jobs/915852165
>
> vs with this fix
>
>   https://gitlab.com/berrange/qemu/-/jobs/915862731
>
>  tests/docker/dockerfiles/centos8.docker | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Reviewed-by: Willian Rampazzo <willianr@redhat.com>

Re: [PATCH] tests: update for rename of CentOS8 PowerTools repo

[Peter Maydell]

On Wed, 16 Dec 2020 at 14:21, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> This was intentionally renamed recently to be all lowercase:
>
> https://bugs.centos.org/view.php?id=17920
> https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>
> This needs to be merged asap, as CI will break for anyone whose branch
> triggers a rebuild of the centos container image.
>
> eg current broken git master:
>
>   https://gitlab.com/berrange/qemu/-/jobs/915852165
>
> vs with this fix
>
>   https://gitlab.com/berrange/qemu/-/jobs/915862731
>
>  tests/docker/dockerfiles/centos8.docker | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
> index 54bc6d54cd..06b67962fd 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -31,6 +31,6 @@ ENV PACKAGES \
>      zlib-devel
>
>  RUN dnf install -y dnf-plugins-core && \
> -  dnf config-manager --set-enabled PowerTools && \
> +  dnf config-manager --set-enabled powertools && \
>    dnf install -y $PACKAGES
>  RUN rpm -q $PACKAGES | sort > /packages.txt

I tried a test merge of this but it fails in Gitlab CI:

https://gitlab.com/qemu-project/qemu/-/jobs/916041167

#6 7.706 Error: No matching repo to modify: powertools.
#6 ERROR: executor failed running [/bin/sh -c dnf install -y
dnf-plugins-core && dnf config-manager --set-enabled powertools && dnf
install -y $PACKAGES]: exit code: 1

thanks
-- PMM

Re: [PATCH] tests: update for rename of CentOS8 PowerTools repo

[Daniel P. Berrangé]

On Wed, Dec 16, 2020 at 04:10:56PM +0000, Peter Maydell wrote:
> On Wed, 16 Dec 2020 at 14:21, Daniel P. Berrangé <berrange@redhat.com> wrote:
> >
> > This was intentionally renamed recently to be all lowercase:
> >
> > https://bugs.centos.org/view.php?id=17920
> > https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes
> >
> > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > ---
> >
> > This needs to be merged asap, as CI will break for anyone whose branch
> > triggers a rebuild of the centos container image.
> >
> > eg current broken git master:
> >
> >   https://gitlab.com/berrange/qemu/-/jobs/915852165
> >
> > vs with this fix
> >
> >   https://gitlab.com/berrange/qemu/-/jobs/915862731
> >
> >  tests/docker/dockerfiles/centos8.docker | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
> > index 54bc6d54cd..06b67962fd 100644
> > --- a/tests/docker/dockerfiles/centos8.docker
> > +++ b/tests/docker/dockerfiles/centos8.docker
> > @@ -31,6 +31,6 @@ ENV PACKAGES \
> >      zlib-devel
> >
> >  RUN dnf install -y dnf-plugins-core && \
> > -  dnf config-manager --set-enabled PowerTools && \
> > +  dnf config-manager --set-enabled powertools && \
> >    dnf install -y $PACKAGES
> >  RUN rpm -q $PACKAGES | sort > /packages.txt
> 
> I tried a test merge of this but it fails in Gitlab CI:
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/916041167
> 
> #6 7.706 Error: No matching repo to modify: powertools.
> #6 ERROR: executor failed running [/bin/sh -c dnf install -y
> dnf-plugins-core && dnf config-manager --set-enabled powertools && dnf
> install -y $PACKAGES]: exit code: 1


#4 [1/4] FROM docker.io/library/centos:8.1.1911@sha256:fe8d824220415eed5477...
#4 DONE 0.0s

#5 [2/4] RUN dnf -y update
#5 CACHED


Looks like in the main repo, it is using cached container layer for
the "dnf -y update" command, and so not pulling in the new centos-release
package.

In forks where the cache is not valid, it'll really run the "dnf update"
command and see the failure.

I think if you go to

  https://gitlab.com/qemu-project/qemu/container_registry

and delete the currently cached centos8 image, then all subsequent runs
will fail until this patch is merged.

Regards,
Daniel
-- 
|: 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] tests: update for rename of CentOS8 PowerTools repo

[Alex Bennée]

Daniel P. Berrangé <berrange@redhat.com> writes:

> This was intentionally renamed recently to be all lowercase:
>
> https://bugs.centos.org/view.php?id=17920
> https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>
> This needs to be merged asap, as CI will break for anyone whose branch
> triggers a rebuild of the centos container image.

Your in luck, Queued to pr/161220-testing-1, thanks.

>
> eg current broken git master:
>
>   https://gitlab.com/berrange/qemu/-/jobs/915852165
>
> vs with this fix
>
>   https://gitlab.com/berrange/qemu/-/jobs/915862731
>
>  tests/docker/dockerfiles/centos8.docker | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
> index 54bc6d54cd..06b67962fd 100644
> --- a/tests/docker/dockerfiles/centos8.docker
> +++ b/tests/docker/dockerfiles/centos8.docker
> @@ -31,6 +31,6 @@ ENV PACKAGES \
>      zlib-devel
>  
>  RUN dnf install -y dnf-plugins-core && \
> -  dnf config-manager --set-enabled PowerTools && \
> +  dnf config-manager --set-enabled powertools && \
>    dnf install -y $PACKAGES
>  RUN rpm -q $PACKAGES | sort > /packages.txt


-- 
Alex Bennée

Re: [PATCH] tests: update for rename of CentOS8 PowerTools repo

[Mark Cave-Ayland]

On 16/12/2020 16:10, Peter Maydell wrote:

> On Wed, 16 Dec 2020 at 14:21, Daniel P. Berrangé <berrange@redhat.com> wrote:
>>
>> This was intentionally renamed recently to be all lowercase:
>>
>> https://bugs.centos.org/view.php?id=17920
>> https://wiki.centos.org/Manuals/ReleaseNotes/CentOS8.2011#Yum_repo_file_and_repoid_changes
>>
>> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
>> ---
>>
>> This needs to be merged asap, as CI will break for anyone whose branch
>> triggers a rebuild of the centos container image.
>>
>> eg current broken git master:
>>
>>    https://gitlab.com/berrange/qemu/-/jobs/915852165
>>
>> vs with this fix
>>
>>    https://gitlab.com/berrange/qemu/-/jobs/915862731
>>
>>   tests/docker/dockerfiles/centos8.docker | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker
>> index 54bc6d54cd..06b67962fd 100644
>> --- a/tests/docker/dockerfiles/centos8.docker
>> +++ b/tests/docker/dockerfiles/centos8.docker
>> @@ -31,6 +31,6 @@ ENV PACKAGES \
>>       zlib-devel
>>
>>   RUN dnf install -y dnf-plugins-core && \
>> -  dnf config-manager --set-enabled PowerTools && \
>> +  dnf config-manager --set-enabled powertools && \
>>     dnf install -y $PACKAGES
>>   RUN rpm -q $PACKAGES | sort > /packages.txt
> 
> I tried a test merge of this but it fails in Gitlab CI:
> 
> https://gitlab.com/qemu-project/qemu/-/jobs/916041167
> 
> #6 7.706 Error: No matching repo to modify: powertools.
> #6 ERROR: executor failed running [/bin/sh -c dnf install -y
> dnf-plugins-core && dnf config-manager --set-enabled powertools && dnf
> install -y $PACKAGES]: exit code: 1

That's odd. Could it be that gitlab is still caching the old image here?


ATB,

Mark.