1. Patchew
  2. Libvirt
  3. View series

[libvirt] [PATCH] ci: Adapt to container name changes

Andrea Bolognani posted 1 patch 4 years, 8 months ago
Test syntax-check passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20190812140901.4977-1-abologna@redhat.com
Makefile.ci | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[libvirt] [PATCH] ci: Adapt to container name changes
Posted by Andrea Bolognani 4 years, 8 months ago 
Since libvirt-dockerfile's commit 7130ffe0a0e9, the containers
used for CI builds have been renamed from buildenv-* to
buildenv-libvirt-* in order to make it possible for projects
other than libvirt to be supported, so we need to update our
Makefile.ci scaffolding accordingly.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
This is connected to

  https://www.redhat.com/archives/libvir-list/2019-August/msg00399.html
  https://www.redhat.com/archives/libvir-list/2019-August/msg00416.html

and should only be merged once the above have been merged *and*
deployed, as in, images with the new names have been generated.

 Makefile.ci | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.ci b/Makefile.ci
index 8857c953b2..dddd438a98 100644
--- a/Makefile.ci
+++ b/Makefile.ci
@@ -49,7 +49,7 @@ CI_SUBMODULES = $(shell git submodule | awk '{ print $$2 }')
 # Location of the container images we're going to pull
 # Can be useful to overridde to use a locally built
 # image instead
-CI_IMAGE_PREFIX = quay.io/libvirt/buildenv-
+CI_IMAGE_PREFIX = quay.io/libvirt/buildenv-libvirt-
 
 # The default tag is ':latest' but if the container
 # repo above uses different conventions this can override it
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] ci: Adapt to container name changes
Posted by Fabiano Fidêncio 4 years, 8 months ago 
On Mon, 2019-08-12 at 16:09 +0200, Andrea Bolognani wrote:
> Since libvirt-dockerfile's commit 7130ffe0a0e9, the containers
> used for CI builds have been renamed from buildenv-* to
> buildenv-libvirt-* in order to make it possible for projects
> other than libvirt to be supported, so we need to update our
> Makefile.ci scaffolding accordingly.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
> This is connected to
> 
>   
> https://www.redhat.com/archives/libvir-list/2019-August/msg00399.html
>   
> https://www.redhat.com/archives/libvir-list/2019-August/msg00416.html
> 
> and should only be merged once the above have been merged *and*
> deployed, as in, images with the new names have been generated.
> 
>  Makefile.ci | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.ci b/Makefile.ci
> index 8857c953b2..dddd438a98 100644
> --- a/Makefile.ci
> +++ b/Makefile.ci
> @@ -49,7 +49,7 @@ CI_SUBMODULES = $(shell git submodule | awk '{
> print $$2 }')
>  # Location of the container images we're going to pull
>  # Can be useful to overridde to use a locally built
>  # image instead
> -CI_IMAGE_PREFIX = quay.io/libvirt/buildenv-
> +CI_IMAGE_PREFIX = quay.io/libvirt/buildenv-libvirt-
>  
>  # The default tag is ':latest' but if the container
>  # repo above uses different conventions this can override it

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] ci: Adapt to container name changes
Posted by Andrea Bolognani 4 years, 8 months ago 
On Fri, 2019-08-16 at 14:32 +0200, Fabiano Fidêncio wrote:
> On Mon, 2019-08-12 at 16:09 +0200, Andrea Bolognani wrote:
> > This is connected to
> > 
> > https://www.redhat.com/archives/libvir-list/2019-August/msg00399.html
> > 
> > https://www.redhat.com/archives/libvir-list/2019-August/msg00416.html
> > 
> > and should only be merged once the above have been merged *and*
> > deployed, as in, images with the new names have been generated.
> 
> Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>

Thanks for the reviews!

I have pushed the other two series but I can't quite push this one
yet because, as we already know, a bunch of MinGW packages have been
dropped from Fedora and thus the buildenv-libvirt-fedora-rawhide
container can't currently be built successfully:

  No match for argument: mingw32-portablexdr
  No match for argument: mingw64-portablexdr
  Error: Unable to find a match: mingw32-portablexdr mingw64-portablexdr

I think the situation would be the same for the libosinfo container.

Do you have any idea how long it will take to get the packages back
in Fedora? Should we just wait for that to happen before rebuilding
the containers, temporarily disable MinGW builds, temporarily switch
MinGW builds to Fedora 30 where I assume all MinGW packages are still
available?

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH] ci: Adapt to container name changes
Posted by Fabiano Fidêncio 4 years, 8 months ago 
On Fri, 2019-08-16 at 15:51 +0200, Andrea Bolognani wrote:
> On Fri, 2019-08-16 at 14:32 +0200, Fabiano Fidêncio wrote:
> > On Mon, 2019-08-12 at 16:09 +0200, Andrea Bolognani wrote:
> > > This is connected to
> > > 
> > > https://www.redhat.com/archives/libvir-list/2019-August/msg00399.html
> > > 
> > > https://www.redhat.com/archives/libvir-list/2019-August/msg00416.html
> > > 
> > > and should only be merged once the above have been merged *and*
> > > deployed, as in, images with the new names have been generated.
> > 
> > Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>
> 
> Thanks for the reviews!
> 
> I have pushed the other two series but I can't quite push this one
> yet because, as we already know, a bunch of MinGW packages have been
> dropped from Fedora and thus the buildenv-libvirt-fedora-rawhide
> container can't currently be built successfully:
> 
>   No match for argument: mingw32-portablexdr
>   No match for argument: mingw64-portablexdr
>   Error: Unable to find a match: mingw32-portablexdr mingw64-
> portablexdr
> 
> I think the situation would be the same for the libosinfo container.
> 
> Do you have any idea how long it will take to get the packages back
> in Fedora?

We're working on it.
For mingw-portablexdr we may end up not adding it back and adding
mingw-libtirpc.

For mingw-libsoup (which is the piece missing from libosinfo side),
we've already asked to un-retire the package.

Bugs are still open though.

> Should we just wait for that to happen before rebuilding
> the containers, temporarily disable MinGW builds, temporarily switch
> MinGW builds to Fedora 30 where I assume all MinGW packages are still
> available?

I'd go for this solution, stick to Fedora 30, at least till the
situation is back to stable on rawhide.

I'll provide you some patches for this and regenerate the images.

Best Regards,
-- 
Fabiano Fidêncio

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
[libvirt] [PATCH 2/1] gitlab: Adapt to container name changes
Posted by Andrea Bolognani 4 years, 8 months ago 
GitLab CI unfortunately doesn't use the standard Makefile.ci
machinery, so its configuration needs to be updated separately.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 .gitlab-ci.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2f06c5de6..3915a37a90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,36 +11,36 @@
 
 debian-9-cross-armv6l:
   <<: *job_definition
-  image: quay.io/libvirt/buildenv-debian-9-cross-armv6l:latest
+  image: quay.io/libvirt/buildenv-libvirt-debian-9-cross-armv6l:latest
 
 debian-9-cross-mips64el:
   <<: *job_definition
-  image: quay.io/libvirt/buildenv-debian-9-cross-mips64el:latest
+  image: quay.io/libvirt/buildenv-libvirt-debian-9-cross-mips64el:latest
 
 debian-9-cross-mipsel:
   <<: *job_definition
-  image: quay.io/libvirt/buildenv-debian-9-cross-mipsel:latest
+  image: quay.io/libvirt/buildenv-libvirt-debian-9-cross-mipsel:latest
 
 debian-10-cross-aarch64:
   <<: *job_definition
-  image: quay.io/libvirt/buildenv-debian-10-cross-aarch64:latest
+  image: quay.io/libvirt/buildenv-libvirt-debian-10-cross-aarch64:latest
 
 debian-10-cross-ppc64le:
   <<: *job_definition
-  image: quay.io/libvirt/buildenv-debian-10-cross-ppc64le:latest
+  image: quay.io/libvirt/buildenv-libvirt-debian-10-cross-ppc64le:latest
 
 debian-10-cross-s390x:
   <<: *job_definition
-  image: quay.io/libvirt/buildenv-debian-10-cross-s390x:latest
+  image: quay.io/libvirt/buildenv-libvirt-debian-10-cross-s390x:latest
 
 debian-sid-cross-armv7l:
   <<: *job_definition
-  image: quay.io/libvirt/buildenv-debian-sid-cross-armv7l:latest
+  image: quay.io/libvirt/buildenv-libvirt-debian-sid-cross-armv7l:latest
 
 debian-sid-cross-i686:
   <<: *job_definition
-  image: quay.io/libvirt/buildenv-debian-sid-cross-i686:latest
+  image: quay.io/libvirt/buildenv-libvirt-debian-sid-cross-i686:latest
 
 debian-sid-cross-mips:
   <<: *job_definition
-  image: quay.io/libvirt/buildenv-debian-sid-cross-mips:latest
+  image: quay.io/libvirt/buildenv-libvirt-debian-sid-cross-mips:latest
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/1] gitlab: Adapt to container name changes
Posted by Fabiano Fidêncio 4 years, 8 months ago 
On Mon, Aug 19, 2019 at 12:48 PM Andrea Bolognani <abologna@redhat.com> wrote:
>
> GitLab CI unfortunately doesn't use the standard Makefile.ci
> machinery, so its configuration needs to be updated separately.
>
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
[libvirt] [PATCH 3/1] travis: Perform MinGW builds on Fedora 30
Posted by Andrea Bolognani 4 years, 8 months ago 
Since libvirt-jenkins-ci commit 3c5ac0af41ba, MinGW packages
are installed on Fedora 30 rather than Fedora Rawhide, so we
need to update the Travis CI configuration accordingly.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
This should be the last one ;)

https://travis-ci.org/andreabolognani/libvirt/builds/574222012

 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b510c81083..afddbe093e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,14 +33,14 @@ matrix:
     - services:
         - docker
       env:
-        - IMAGE="fedora-rawhide"
+        - IMAGE="fedora-30"
         - MINGW="mingw32"
       script:
         - make -f Makefile.ci ci-build@$IMAGE CI_CONFIGURE="$MINGW-configure"
     - services:
         - docker
       env:
-        - IMAGE="fedora-rawhide"
+        - IMAGE="fedora-30"
         - MINGW="mingw64"
       script:
         - make -f Makefile.ci ci-build@$IMAGE CI_CONFIGURE="$MINGW-configure"
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 3/1] travis: Perform MinGW builds on Fedora 30
Posted by Fabiano Fidêncio 4 years, 8 months ago 
On Tue, Aug 20, 2019 at 10:40 AM Andrea Bolognani <abologna@redhat.com> wrote:
>
> Since libvirt-jenkins-ci commit 3c5ac0af41ba, MinGW packages
> are installed on Fedora 30 rather than Fedora Rawhide, so we
> need to update the Travis CI configuration accordingly.
>
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
> This should be the last one ;)
>
> https://travis-ci.org/andreabolognani/libvirt/builds/574222012
>
>  .travis.yml | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com>

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.