[libvirt] [PATCH v2 0/3] ci: Various updates
These are needed to keep Travis CI and GitLab CI running smoothly. Changes from [v1]: * update tag names in GitLab CI configuration; * move mips64le build off Debian sid. [v1] https://www.redhat.com/archives/libvir-list/2019-July/msg00614.html Andrea Bolognani (3): ci: Use default image tag "latest" ci: Update image list gitlab: Perform some builds on Debian 10 .gitlab-ci.yml | 34 +++++++++++++++++----------------- Makefile.ci | 24 +++++++++++++----------- 2 files changed, 30 insertions(+), 28 deletions(-) -- 2.21.0
Up until now, our images have been tagged as "master" instead of the default "latest" due to the way the build process worked, but we're using the default now. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .gitlab-ci.yml | 18 +++++++++--------- Makefile.ci | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1f9f37166..b31b4ddbdb 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:master + image: quay.io/libvirt/buildenv-debian-9-cross-armv6l:latest debian-9-cross-mipsel: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-9-cross-mipsel:master + image: quay.io/libvirt/buildenv-debian-9-cross-mipsel:latest debian-9-cross-ppc64le: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-9-cross-ppc64le:master + image: quay.io/libvirt/buildenv-debian-9-cross-ppc64le:latest debian-9-cross-s390x: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-9-cross-s390x:master + image: quay.io/libvirt/buildenv-debian-9-cross-s390x:latest debian-sid-cross-aarch64: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-sid-cross-aarch64:master + image: quay.io/libvirt/buildenv-debian-sid-cross-aarch64:latest debian-sid-cross-armv7l: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-sid-cross-armv7l:master + image: quay.io/libvirt/buildenv-debian-sid-cross-armv7l:latest debian-sid-cross-i686: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-sid-cross-i686:master + image: quay.io/libvirt/buildenv-debian-sid-cross-i686:latest debian-sid-cross-mips64el: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-sid-cross-mips64el:master + image: quay.io/libvirt/buildenv-debian-sid-cross-mips64el:latest debian-sid-cross-mips: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-sid-cross-mips:master + image: quay.io/libvirt/buildenv-debian-sid-cross-mips:latest diff --git a/Makefile.ci b/Makefile.ci index 241c58d2d4..009d0df8fa 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -53,7 +53,7 @@ CI_IMAGE_PREFIX = quay.io/libvirt/buildenv- # The default tag is ':latest' but if the container # repo above uses different conventions this can override it -CI_IMAGE_TAG = :master +CI_IMAGE_TAG = :latest # We delete the virtual root after completion, set # to 0 if you need to keep it around for debugging -- 2.21.0
On Thu, Jul 11, 2019 at 12:53:05PM +0200, Andrea Bolognani wrote:
Up until now, our images have been tagged as "master" instead of the default "latest" due to the way the build process worked, but we're using the default now.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .gitlab-ci.yml | 18 +++++++++--------- Makefile.ci | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
We really need to change this so that it fetches the image list dynamically from Quay, but for the time being at least make sure the static list is accurate. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- Makefile.ci | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Makefile.ci b/Makefile.ci index 009d0df8fa..8857c953b2 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -243,23 +243,25 @@ ci-help: @echo @echo " centos-7" @echo " debian-9" + @echo " debian-10" @echo " debian-sid" - @echo " fedora-28" @echo " fedora-29" + @echo " fedora-30" @echo " fedora-rawhide" + @echo " ubuntu-16" @echo " ubuntu-18" @echo @echo "Available cross-compiler container images:" @echo - @echo " debian-{9,sid}-cross-aarch64" - @echo " debian-{9,sid}-cross-armv6l" - @echo " debian-{9,sid}-cross-armv7l" - @echo " debian-sid-cross-i686" - @echo " debian-{9,sid}-cross-mips64el" - @echo " debian-{9,sid}-cross-mips" - @echo " debian-{9,sid}-cross-mipsel" - @echo " debian-{9,sid}-cross-ppc64le" - @echo " debian-{9,sid}-cross-s390x" + @echo " debian-{9,10,sid}-cross-aarch64" + @echo " debian-{9,10,sid}-cross-armv6l" + @echo " debian-{9,10,sid}-cross-armv7l" + @echo " debian-{10,sid}-cross-i686" + @echo " debian-{9,10,sid}-cross-mips64el" + @echo " debian-{9,10,sid}-cross-mips" + @echo " debian-{9,10,sid}-cross-mipsel" + @echo " debian-{9,10,sid}-cross-ppc64le" + @echo " debian-{9,10,sid}-cross-s390x" @echo @echo "Available make variables:" @echo -- 2.21.0
On Thu, Jul 11, 2019 at 12:53:06PM +0200, Andrea Bolognani wrote:
We really need to change this so that it fetches the image list dynamically from Quay, but for the time being at least make sure the static list is accurate.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- Makefile.ci | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
The split is mostly arbitrary, but we purposefully moved the mips64el builds off sid since currently that container is failing to build and is thus unavailable. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- Again, this is 100% untested :) .gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b31b4ddbdb..f1c267c274 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,28 +6,32 @@ - make -j $(getconf _NPROCESSORS_ONLN) # We could run every arch on both versions, but it is a little -# overkill. Instead we run half the jobs on 9 and half the jobs -# on sid to give reasonable cross-coverage. +# overkill. Instead we split jobs evenly across 9, 10 and sid +# to achieve reasonable cross-coverage. debian-9-cross-armv6l: <<: *job_definition image: quay.io/libvirt/buildenv-debian-9-cross-armv6l:latest +debian-9-cross-mips64el: + <<: *job_definition + image: quay.io/libvirt/buildenv-debian-9-cross-mips64el:latest + debian-9-cross-mipsel: <<: *job_definition image: quay.io/libvirt/buildenv-debian-9-cross-mipsel:latest -debian-9-cross-ppc64le: +debian-10-cross-aarch64: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-9-cross-ppc64le:latest + image: quay.io/libvirt/buildenv-debian-10-cross-aarch64:latest -debian-9-cross-s390x: +debian-10-cross-ppc64le: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-9-cross-s390x:latest + image: quay.io/libvirt/buildenv-debian-10-cross-ppc64le:latest -debian-sid-cross-aarch64: +debian-10-cross-s390x: <<: *job_definition - image: quay.io/libvirt/buildenv-debian-sid-cross-aarch64:latest + image: quay.io/libvirt/buildenv-debian-10-cross-s390x:latest debian-sid-cross-armv7l: <<: *job_definition @@ -37,10 +41,6 @@ debian-sid-cross-i686: <<: *job_definition image: quay.io/libvirt/buildenv-debian-sid-cross-i686:latest -debian-sid-cross-mips64el: - <<: *job_definition - image: quay.io/libvirt/buildenv-debian-sid-cross-mips64el:latest - debian-sid-cross-mips: <<: *job_definition image: quay.io/libvirt/buildenv-debian-sid-cross-mips:latest -- 2.21.0
On Thu, Jul 11, 2019 at 12:53:07PM +0200, Andrea Bolognani wrote:
The split is mostly arbitrary, but we purposefully moved the mips64el builds off sid since currently that container is failing to build and is thus unavailable.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- Again, this is 100% untested :)
.gitlab-ci.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b31b4ddbdb..f1c267c274 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,28 +6,32 @@ - make -j $(getconf _NPROCESSORS_ONLN)
# We could run every arch on both versions, but it is a little
s/both versions/every version/
-# overkill. Instead we run half the jobs on 9 and half the jobs -# on sid to give reasonable cross-coverage. +# overkill. Instead we split jobs evenly across 9, 10 and sid +# to achieve reasonable cross-coverage.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé