On Fri, Sep 03, 2021 at 10:19:32AM +0100, Richard W.M. Jones wrote:
On Fri, Sep 03, 2021 at 11:05:02AM +0200, Martin Kletzander wrote:- ci/refresh: add generation for i686 connections - ci/build.sh: indentation fix and i686-related changes - ci/{containers,cirrus}: regenerate files - .gitlab-ci.yaml: add i686 buildsSigned-off-by: Martin Kletzander <mklet...@redhat.com> --- The pipeline for this commit can be seen here: https://gitlab.com/nertpinx/libnbd/-/pipelines/364646965I would say about this patch in general that it's probably not necessary to test it on every i686 distro, since what we're trying to achieve is to look for regressions in 32 bit code. But the work's done now ...
This patch adds it to the debian builds for debian 10 and 11 only as they seem to have the most straight-forward support for cross-builds.
ACKWhile at it I was wondering if we maybe want to set up the e-mail notifications so that libguestfs list is notified as well, maybe someone else who is interested (Eric?). We can also set up something like libguestfs-ci list where all the notifications from all projects get sent (similarly to libvirt-ci list), but I do not suppose that is something people would be interested in. Correct me if I am wrong, though ;) Feedback appreciated.You can subscribe the libguestfs mailing list. However I don't think adding a new mailing list is necessary. The list is low traffic and I have enough mailing lists.
OK, I'll do that. Thanks!
Rich..gitlab-ci.yml | 39 ++++++-- ci/build.sh | 26 ++++-- ci/cirrus/freebsd-12.vars | 2 +- ci/cirrus/freebsd-13.vars | 2 +- ci/cirrus/freebsd-current.vars | 2 +- ci/cirrus/macos-11.vars | 2 +- ci/containers/alpine-314.Dockerfile | 2 +- ci/containers/alpine-edge.Dockerfile | 2 +- ci/containers/centos-8.Dockerfile | 2 +- ci/containers/centos-stream-8.Dockerfile | 2 +- ci/containers/debian-10-cross-i686.Dockerfile | 90 +++++++++++++++++++ ci/containers/debian-10.Dockerfile | 2 +- ci/containers/debian-11-cross-i686.Dockerfile | 90 +++++++++++++++++++ ci/containers/debian-11.Dockerfile | 68 ++++++++++++++ ci/containers/debian-sid.Dockerfile | 2 +- ci/containers/fedora-33.Dockerfile | 2 +- ci/containers/fedora-34-cross-i686.Dockerfile | 0 ci/containers/fedora-34.Dockerfile | 2 +- ci/containers/fedora-rawhide.Dockerfile | 2 +- ci/containers/opensuse-leap-152.Dockerfile | 2 +- ci/containers/opensuse-tumbleweed.Dockerfile | 2 +- ci/containers/ubuntu-1804.Dockerfile | 2 +- ci/containers/ubuntu-2004.Dockerfile | 2 +- ci/refresh | 6 ++ 24 files changed, 322 insertions(+), 31 deletions(-) create mode 100644 ci/containers/debian-10-cross-i686.Dockerfile create mode 100644 ci/containers/debian-11-cross-i686.Dockerfile create mode 100644 ci/containers/debian-11.Dockerfile create mode 100644 ci/containers/fedora-34-cross-i686.Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 22e732b184d9..a90c25956ca4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -95,6 +95,17 @@ stages: rules: - if: "$CIRRUS_GITHUB_REPO && $CIRRUS_API_TOKEN" +# Cross-compilation container build jobs +i686-debian-10-container: + extends: .container_job + variables: + NAME: debian-10-cross-i686 + +i686-debian-11-container: + extends: .container_job + variables: + NAME: debian-11-cross-i686 + # Native container build jobs x64-alpine-314-container: extends: .container_job @@ -116,10 +127,10 @@ x64-centos-stream-8-container: variables: NAME: centos-stream-8 -x64-debian-10-container: +x64-debian-11-container: extends: .container_job variables: - NAME: debian-10 + NAME: debian-11 x64-debian-sid-container: extends: .container_job @@ -162,14 +173,30 @@ x64-ubuntu-2004-container: variables: NAME: ubuntu-2004 -# Native architecture build + test jobs - -x64-debian-10: +# Cross-compilation build jobs +i686-debian-10: extends: .native_build_job needs: - - x64-debian-10-container + - i686-debian-10-container variables: NAME: debian-10 + CROSS: i686 + +i686-debian-11: + extends: .native_build_job + needs: + - i686-debian-11-container + variables: + NAME: debian-11 + CROSS: i686 + +# Native architecture build + test jobs +x64-debian-11: + extends: .native_build_job + needs: + - x64-debian-11-container + variables: + NAME: debian-11 x64-debian-sid: extends: .native_build_job diff --git a/ci/build.sh b/ci/build.sh index 8ee4a87ea9b7..fc43c3008952 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -e +set -xe skip_tests() { # Add a way to run all the tests, even the skipped ones, with an environment @@ -72,24 +72,34 @@ main() { CONFIG_ARGS="\ --enable-gcc-warnings \ ---enable-fuse \ ---enable-ocaml \ ---enable-python \ ---enable-golang \ --with-gnutls \ --with-libxml2 \ " - if test "$GOLANG" != "skip" + if "$CROSS" then - CONFIG_ARGS="$CONFIG_ARGS --enable-golang" + CONFIG_ARGS="$CONFIG_ARGS + --disable-fuse + --disable-ocaml + --disable-python" + else + CONFIG_ARGS="$CONFIG_ARGS + --enable-fuse + --enable-ocaml + --enable-python" + if test "$GOLANG" = "skip" + then + CONFIG_ARGS="$CONFIG_ARGS --disable-golang" + else + CONFIG_ARGS="$CONFIG_ARGS --enable-golang" + fi fi ./configure $CONFIGURE_OPTS $CONFIG_ARGS $MAKE - if test -n "$CROSS" + if test -n "$CROSS" -a "$CROSS" != "i686" then echo "Possibly run tests with an emulator in the future" return 0 diff --git a/ci/cirrus/freebsd-12.vars b/ci/cirrus/freebsd-12.vars index 721c627af0a1..2573de241849 100644 --- a/ci/cirrus/freebsd-12.vars +++ b/ci/cirrus/freebsd-12.vars @@ -2,7 +2,7 @@ # # $ lcitool variables freebsd-12 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' diff --git a/ci/cirrus/freebsd-13.vars b/ci/cirrus/freebsd-13.vars index ce43238c7a9f..40e8ddd43e49 100644 --- a/ci/cirrus/freebsd-13.vars +++ b/ci/cirrus/freebsd-13.vars @@ -2,7 +2,7 @@ # # $ lcitool variables freebsd-13 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' diff --git a/ci/cirrus/freebsd-current.vars b/ci/cirrus/freebsd-current.vars index e8b58a515836..73dff989ffb4 100644 --- a/ci/cirrus/freebsd-current.vars +++ b/ci/cirrus/freebsd-current.vars @@ -2,7 +2,7 @@ # # $ lcitool variables freebsd-current libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci PACKAGING_COMMAND='pkg' CCACHE='/usr/local/bin/ccache' diff --git a/ci/cirrus/macos-11.vars b/ci/cirrus/macos-11.vars index 691917d16de0..eae75535a960 100644 --- a/ci/cirrus/macos-11.vars +++ b/ci/cirrus/macos-11.vars @@ -2,7 +2,7 @@ # # $ lcitool variables macos-11 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci PACKAGING_COMMAND='brew' CCACHE='/usr/local/bin/ccache' diff --git a/ci/containers/alpine-314.Dockerfile b/ci/containers/alpine-314.Dockerfile index f818f27ef354..0fb954abb66b 100644 --- a/ci/containers/alpine-314.Dockerfile +++ b/ci/containers/alpine-314.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile alpine-314 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/alpine:3.14 diff --git a/ci/containers/alpine-edge.Dockerfile b/ci/containers/alpine-edge.Dockerfile index d59ed0141513..e27775d647fb 100644 --- a/ci/containers/alpine-edge.Dockerfile +++ b/ci/containers/alpine-edge.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile alpine-edge libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/alpine:edge diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile index ac1079a47f04..1e05d4cda98a 100644 --- a/ci/containers/centos-8.Dockerfile +++ b/ci/containers/centos-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-8 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/centos:8 diff --git a/ci/containers/centos-stream-8.Dockerfile b/ci/containers/centos-stream-8.Dockerfile index 29be6ed4c1fd..8f2dff57b3a3 100644 --- a/ci/containers/centos-stream-8.Dockerfile +++ b/ci/containers/centos-stream-8.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile centos-stream-8 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM quay.io/centos/centos:stream8 diff --git a/ci/containers/debian-10-cross-i686.Dockerfile b/ci/containers/debian-10-cross-i686.Dockerfile new file mode 100644 index 000000000000..c7c8dca8df4e --- /dev/null +++ b/ci/containers/debian-10-cross-i686.Dockerfile @@ -0,0 +1,90 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross i686 debian-10 libnbd +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:10-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + bash-completion \ + bsdmainutils \ + ca-certificates \ + ccache \ + diffutils \ + flake8 \ + fuse3 \ + git \ + gnutls-bin \ + golang \ + iproute2 \ + jq \ + libtool-bin \ + locales \ + make \ + nbd-client \ + nbd-server \ + nbdkit \ + ocaml \ + ocaml-findlib \ + ocaml-nox \ + perl \ + perl-base \ + pkgconf \ + python3-dev \ + qemu \ + qemu-utils \ + sed \ + valgrind && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc + +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture i386 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-i686-linux-gnu \ + gcc-i686-linux-gnu \ + libc6-dev:i386 \ + libev-dev:i386 \ + libfuse3-dev:i386 \ + libglib2.0-dev:i386 \ + libgnutls28-dev:i386 \ + libxml2-dev:i386 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/i686-linux-gnu-gcc'\n\ +ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/i686-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'x86'\n\ +cpu = 'i686'\n\ +endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + +ENV ABI "i686-linux-gnu" +ENV CONFIGURE_OPTS "--host=i686-linux-gnu" diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile index 0d039359223e..fbea28350a06 100644 --- a/ci/containers/debian-10.Dockerfile +++ b/ci/containers/debian-10.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-10 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:10-slim diff --git a/ci/containers/debian-11-cross-i686.Dockerfile b/ci/containers/debian-11-cross-i686.Dockerfile new file mode 100644 index 000000000000..e0d4fc15961d --- /dev/null +++ b/ci/containers/debian-11-cross-i686.Dockerfile @@ -0,0 +1,90 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile --cross i686 debian-11 libnbd +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + bash-completion \ + bsdextrautils \ + ca-certificates \ + ccache \ + diffutils \ + flake8 \ + fuse3 \ + git \ + gnutls-bin \ + golang \ + iproute2 \ + jq \ + libtool-bin \ + locales \ + make \ + nbd-client \ + nbd-server \ + nbdkit \ + ocaml \ + ocaml-findlib \ + ocaml-nox \ + perl \ + perl-base \ + pkgconf \ + python3-dev \ + qemu \ + qemu-utils \ + sed \ + valgrind && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc + +RUN export DEBIAN_FRONTEND=noninteractive && \ + dpkg --add-architecture i386 && \ + eatmydata apt-get update && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ + eatmydata apt-get install --no-install-recommends -y \ + g++-i686-linux-gnu \ + gcc-i686-linux-gnu \ + libc6-dev:i386 \ + libev-dev:i386 \ + libfuse3-dev:i386 \ + libglib2.0-dev:i386 \ + libgnutls28-dev:i386 \ + libxml2-dev:i386 && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + mkdir -p /usr/local/share/meson/cross && \ + echo "[binaries]\n\ +c = '/usr/bin/i686-linux-gnu-gcc'\n\ +ar = '/usr/bin/i686-linux-gnu-gcc-ar'\n\ +strip = '/usr/bin/i686-linux-gnu-strip'\n\ +pkgconfig = '/usr/bin/i686-linux-gnu-pkg-config'\n\ +\n\ +[host_machine]\n\ +system = 'linux'\n\ +cpu_family = 'x86'\n\ +cpu = 'i686'\n\ +endian = 'little'" > /usr/local/share/meson/cross/i686-linux-gnu + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" + +ENV ABI "i686-linux-gnu" +ENV CONFIGURE_OPTS "--host=i686-linux-gnu" diff --git a/ci/containers/debian-11.Dockerfile b/ci/containers/debian-11.Dockerfile new file mode 100644 index 000000000000..c817870daa73 --- /dev/null +++ b/ci/containers/debian-11.Dockerfile @@ -0,0 +1,68 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool dockerfile debian-11 libnbd +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:11-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + autoconf \ + automake \ + bash-completion \ + bsdextrautils \ + ca-certificates \ + ccache \ + clang \ + diffutils \ + flake8 \ + fuse3 \ + g++ \ + gcc \ + git \ + gnutls-bin \ + golang \ + iproute2 \ + jq \ + libc6-dev \ + libev-dev \ + libfuse3-dev \ + libglib2.0-dev \ + libgnutls28-dev \ + libtool-bin \ + libxml2-dev \ + locales \ + make \ + nbd-client \ + nbd-server \ + nbdkit \ + ocaml \ + ocaml-findlib \ + ocaml-nox \ + perl \ + perl-base \ + pkgconf \ + python3-dev \ + qemu \ + qemu-utils \ + sed \ + valgrind && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile index fe8f49524639..909b772c473f 100644 --- a/ci/containers/debian-sid.Dockerfile +++ b/ci/containers/debian-sid.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile debian-sid libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/debian:sid-slim diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/fedora-33.Dockerfile index 3383762b3a5b..353aa0d1e789 100644 --- a/ci/containers/fedora-33.Dockerfile +++ b/ci/containers/fedora-33.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-33 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:33 diff --git a/ci/containers/fedora-34-cross-i686.Dockerfile b/ci/containers/fedora-34-cross-i686.Dockerfile new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/ci/containers/fedora-34.Dockerfile b/ci/containers/fedora-34.Dockerfile index f2bfba91e94e..35d84cc3e0f2 100644 --- a/ci/containers/fedora-34.Dockerfile +++ b/ci/containers/fedora-34.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-34 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:34 diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile index 40d45bd386c5..acbb61f0e74a 100644 --- a/ci/containers/fedora-rawhide.Dockerfile +++ b/ci/containers/fedora-rawhide.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile fedora-rawhide libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.fedoraproject.org/fedora:rawhide diff --git a/ci/containers/opensuse-leap-152.Dockerfile b/ci/containers/opensuse-leap-152.Dockerfile index 86e7171702a2..050ec442151e 100644 --- a/ci/containers/opensuse-leap-152.Dockerfile +++ b/ci/containers/opensuse-leap-152.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-leap-152 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.opensuse.org/opensuse/leap:15.2 diff --git a/ci/containers/opensuse-tumbleweed.Dockerfile b/ci/containers/opensuse-tumbleweed.Dockerfile index 004794743c23..bbcdd3220094 100644 --- a/ci/containers/opensuse-tumbleweed.Dockerfile +++ b/ci/containers/opensuse-tumbleweed.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile opensuse-tumbleweed libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM registry.opensuse.org/opensuse/tumbleweed:latest diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile index 624b4381d8b6..72dc53b39c13 100644 --- a/ci/containers/ubuntu-1804.Dockerfile +++ b/ci/containers/ubuntu-1804.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-1804 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/ubuntu:18.04 diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile index e6e04391b7d5..6a11fae8d27c 100644 --- a/ci/containers/ubuntu-2004.Dockerfile +++ b/ci/containers/ubuntu-2004.Dockerfile @@ -2,7 +2,7 @@ # # $ lcitool dockerfile ubuntu-2004 libnbd # -# https://gitlab.com/libvirt/libvirt-ci/-/commit/0bb9bfada8e143e05bb436a06747d227d19f0df4 +# https://gitlab.com/libvirt/libvirt-ci FROM docker.io/library/ubuntu:20.04 diff --git a/ci/refresh b/ci/refresh index dee8b0bc9713..8a276e42dec6 100755 --- a/ci/refresh +++ b/ci/refresh @@ -22,6 +22,12 @@ do then $LCITOOL variables "$target" libnbd >"$ci_path/cirrus/$target.vars" else + if test "$target" = "debian-11" -o "$target" = "debian-10" + then + $LCITOOL dockerfile -x i686 "$target" \ + libnbd >"$ci_path/containers/$target-cross-i686.Dockerfile" + fi + $LCITOOL dockerfile "$target" libnbd >"$ci_path/containers/$target.Dockerfile" fi done -- 2.33.0-- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org
signature.asc
Description: PGP signature
_______________________________________________ Libguestfs mailing list Libguestfs@redhat.com https://listman.redhat.com/mailman/listinfo/libguestfs
