Xen 4.14 no longer runs in Gitlab CI.  Drop the dependency to shrink the build
containers a little.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@citrix.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Michal Orzel <michal.orzel@amd.com>
CC: Doug Goldstein <cardoe@cardoe.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
---
 automation/build/archlinux/current.dockerfile        | 2 --
 automation/build/centos/7.dockerfile                 | 2 --
 automation/build/debian/bookworm.dockerfile          | 2 --
 automation/build/debian/jessie.dockerfile            | 2 --
 automation/build/debian/stretch.dockerfile           | 2 --
 automation/build/fedora/29.dockerfile                | 2 --
 automation/build/suse/opensuse-leap.dockerfile       | 2 --
 automation/build/suse/opensuse-tumbleweed.dockerfile | 2 --
 automation/build/ubuntu/bionic.dockerfile            | 2 --
 automation/build/ubuntu/focal.dockerfile             | 2 --
 automation/build/ubuntu/trusty.dockerfile            | 2 --
 automation/build/ubuntu/xenial.dockerfile            | 2 --
 12 files changed, 24 deletions(-)

diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile
index d974a1434fd5..3e37ab5c40c1 100644
--- a/automation/build/archlinux/current.dockerfile
+++ b/automation/build/archlinux/current.dockerfile
@@ -19,8 +19,6 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \
         iasl \
         inetutils \
         iproute \
-        # lib32-glibc for Xen < 4.15
-        lib32-glibc \
         libaio \
         libcacard \
         libgl \
diff --git a/automation/build/centos/7.dockerfile b/automation/build/centos/7.dockerfile
index ab450f0b3a0e..1cdc16fc05f9 100644
--- a/automation/build/centos/7.dockerfile
+++ b/automation/build/centos/7.dockerfile
@@ -32,8 +32,6 @@ RUN yum -y update \
         yajl-devel \
         pixman-devel \
         glibc-devel \
-        # glibc-devel.i686 for Xen < 4.15
-        glibc-devel.i686 \
         make \
         binutils \
         git \
diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile
index 459f8e30bdc6..d893218fc4bd 100644
--- a/automation/build/debian/bookworm.dockerfile
+++ b/automation/build/debian/bookworm.dockerfile
@@ -31,8 +31,6 @@ RUN apt-get update && \
         bin86 \
         bcc \
         liblzma-dev \
-        # libc6-dev-i386 for Xen < 4.15
-        libc6-dev-i386 \
         libnl-3-dev \
         ocaml-nox \
         libfindlib-ocaml-dev \
diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile
index 32fc952fbc2d..308675cac150 100644
--- a/automation/build/debian/jessie.dockerfile
+++ b/automation/build/debian/jessie.dockerfile
@@ -37,8 +37,6 @@ RUN apt-get update && \
         bin86 \
         bcc \
         liblzma-dev \
-        # libc6-dev-i386 for Xen < 4.15
-        libc6-dev-i386 \
         libnl-3-dev \
         ocaml-nox \
         libfindlib-ocaml-dev \
diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
index e2706a8f3589..59794ed4677b 100644
--- a/automation/build/debian/stretch.dockerfile
+++ b/automation/build/debian/stretch.dockerfile
@@ -38,8 +38,6 @@ RUN apt-get update && \
         bin86 \
         bcc \
         liblzma-dev \
-        # libc6-dev-i386 for Xen < 4.15
-        libc6-dev-i386 \
         libnl-3-dev \
         ocaml-nox \
         libfindlib-ocaml-dev \
diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile
index 42a87ce6c84b..f473ae13e7c1 100644
--- a/automation/build/fedora/29.dockerfile
+++ b/automation/build/fedora/29.dockerfile
@@ -21,8 +21,6 @@ RUN dnf -y install \
         yajl-devel \
         pixman-devel \
         glibc-devel \
-        # glibc-devel.i686 for Xen < 4.15
-        glibc-devel.i686 \
         make \
         binutils \
         git \
diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
index e1ec38a41445..48d0d50d005d 100644
--- a/automation/build/suse/opensuse-leap.dockerfile
+++ b/automation/build/suse/opensuse-leap.dockerfile
@@ -28,8 +28,6 @@ RUN zypper install -y --no-recommends \
         ghostscript \
         glib2-devel \
         glibc-devel \
-        # glibc-devel-32bit for Xen < 4.15
-        glibc-devel-32bit \
         gzip \
         hostname \
         libaio-devel \
diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile
index f00e03eda7b1..53542ba1f4d9 100644
--- a/automation/build/suse/opensuse-tumbleweed.dockerfile
+++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
@@ -26,8 +26,6 @@ RUN zypper install -y --no-recommends \
         ghostscript \
         glib2-devel \
         glibc-devel \
-        # glibc-devel-32bit for Xen < 4.15
-        glibc-devel-32bit \
         gzip \
         hostname \
         libaio-devel \
diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/ubuntu/bionic.dockerfile
index 77d7f933860c..910d3c4b5315 100644
--- a/automation/build/ubuntu/bionic.dockerfile
+++ b/automation/build/ubuntu/bionic.dockerfile
@@ -31,8 +31,6 @@ RUN apt-get update && \
         bin86 \
         bcc \
         liblzma-dev \
-        # libc6-dev-i386 for Xen < 4.15
-        libc6-dev-i386 \
         libnl-3-dev \
         ocaml-nox \
         libfindlib-ocaml-dev \
diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile
index 30a9b8e84ffe..7c6a4d07566b 100644
--- a/automation/build/ubuntu/focal.dockerfile
+++ b/automation/build/ubuntu/focal.dockerfile
@@ -31,8 +31,6 @@ RUN apt-get update && \
         bin86 \
         bcc \
         liblzma-dev \
-        # libc6-dev-i386 for Xen < 4.15
-        libc6-dev-i386 \
         libnl-3-dev \
         ocaml-nox \
         libfindlib-ocaml-dev \
diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/ubuntu/trusty.dockerfile
index 0d33578c4e1d..8bd8c085a781 100644
--- a/automation/build/ubuntu/trusty.dockerfile
+++ b/automation/build/ubuntu/trusty.dockerfile
@@ -31,8 +31,6 @@ RUN apt-get update && \
         bin86 \
         bcc \
         liblzma-dev \
-        # libc6-dev-i386 for Xen < 4.15
-        libc6-dev-i386 \
         libnl-3-dev \
         ocaml-nox \
         libfindlib-ocaml-dev \
diff --git a/automation/build/ubuntu/xenial.dockerfile b/automation/build/ubuntu/xenial.dockerfile
index e8035434f804..f6296d32925c 100644
--- a/automation/build/ubuntu/xenial.dockerfile
+++ b/automation/build/ubuntu/xenial.dockerfile
@@ -31,8 +31,6 @@ RUN apt-get update && \
         bin86 \
         bcc \
         liblzma-dev \
-        # libc6-dev-i386 for Xen < 4.15
-        libc6-dev-i386 \
         libnl-3-dev \
         ocaml-nox \
         libfindlib-ocaml-dev \

base-commit: 23cd1207e7f6ee3e51fb42e11dba8d7cdb28e1e5
-- 
2.30.2

On 25.04.2024 19:47, Andrew Cooper wrote:
> Xen 4.14 no longer runs in Gitlab CI.  Drop the dependency to shrink the build
> containers a little.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

This is probably okay seeing that 4.15 shouldn't need to be tested anymore
either, for having gone out of support. Otherwise I would have asked whether
this isn't premature, as at some point there will want to be N-1 ==> N
migration tests, like osstest has them. Extending the description a little
to this effect may be desirable.

Jan

On Thu, 24 Apr 2024, Andrew Cooper wrote:
> Xen 4.14 no longer runs in Gitlab CI.  Drop the dependency to shrink the build
> containers a little.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Stefano Stabellini <sstabellini@kernel.org>


> ---
> CC: Anthony PERARD <anthony.perard@citrix.com>
> CC: Stefano Stabellini <sstabellini@kernel.org>
> CC: Michal Orzel <michal.orzel@amd.com>
> CC: Doug Goldstein <cardoe@cardoe.com>
> CC: Roger Pau Monné <roger.pau@citrix.com>
> ---
>  automation/build/archlinux/current.dockerfile        | 2 --
>  automation/build/centos/7.dockerfile                 | 2 --
>  automation/build/debian/bookworm.dockerfile          | 2 --
>  automation/build/debian/jessie.dockerfile            | 2 --
>  automation/build/debian/stretch.dockerfile           | 2 --
>  automation/build/fedora/29.dockerfile                | 2 --
>  automation/build/suse/opensuse-leap.dockerfile       | 2 --
>  automation/build/suse/opensuse-tumbleweed.dockerfile | 2 --
>  automation/build/ubuntu/bionic.dockerfile            | 2 --
>  automation/build/ubuntu/focal.dockerfile             | 2 --
>  automation/build/ubuntu/trusty.dockerfile            | 2 --
>  automation/build/ubuntu/xenial.dockerfile            | 2 --
>  12 files changed, 24 deletions(-)
> 
> diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile
> index d974a1434fd5..3e37ab5c40c1 100644
> --- a/automation/build/archlinux/current.dockerfile
> +++ b/automation/build/archlinux/current.dockerfile
> @@ -19,8 +19,6 @@ RUN pacman -S --refresh --sysupgrade --noconfirm --noprogressbar --needed \
>          iasl \
>          inetutils \
>          iproute \
> -        # lib32-glibc for Xen < 4.15
> -        lib32-glibc \
>          libaio \
>          libcacard \
>          libgl \
> diff --git a/automation/build/centos/7.dockerfile b/automation/build/centos/7.dockerfile
> index ab450f0b3a0e..1cdc16fc05f9 100644
> --- a/automation/build/centos/7.dockerfile
> +++ b/automation/build/centos/7.dockerfile
> @@ -32,8 +32,6 @@ RUN yum -y update \
>          yajl-devel \
>          pixman-devel \
>          glibc-devel \
> -        # glibc-devel.i686 for Xen < 4.15
> -        glibc-devel.i686 \
>          make \
>          binutils \
>          git \
> diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile
> index 459f8e30bdc6..d893218fc4bd 100644
> --- a/automation/build/debian/bookworm.dockerfile
> +++ b/automation/build/debian/bookworm.dockerfile
> @@ -31,8 +31,6 @@ RUN apt-get update && \
>          bin86 \
>          bcc \
>          liblzma-dev \
> -        # libc6-dev-i386 for Xen < 4.15
> -        libc6-dev-i386 \
>          libnl-3-dev \
>          ocaml-nox \
>          libfindlib-ocaml-dev \
> diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile
> index 32fc952fbc2d..308675cac150 100644
> --- a/automation/build/debian/jessie.dockerfile
> +++ b/automation/build/debian/jessie.dockerfile
> @@ -37,8 +37,6 @@ RUN apt-get update && \
>          bin86 \
>          bcc \
>          liblzma-dev \
> -        # libc6-dev-i386 for Xen < 4.15
> -        libc6-dev-i386 \
>          libnl-3-dev \
>          ocaml-nox \
>          libfindlib-ocaml-dev \
> diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile
> index e2706a8f3589..59794ed4677b 100644
> --- a/automation/build/debian/stretch.dockerfile
> +++ b/automation/build/debian/stretch.dockerfile
> @@ -38,8 +38,6 @@ RUN apt-get update && \
>          bin86 \
>          bcc \
>          liblzma-dev \
> -        # libc6-dev-i386 for Xen < 4.15
> -        libc6-dev-i386 \
>          libnl-3-dev \
>          ocaml-nox \
>          libfindlib-ocaml-dev \
> diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile
> index 42a87ce6c84b..f473ae13e7c1 100644
> --- a/automation/build/fedora/29.dockerfile
> +++ b/automation/build/fedora/29.dockerfile
> @@ -21,8 +21,6 @@ RUN dnf -y install \
>          yajl-devel \
>          pixman-devel \
>          glibc-devel \
> -        # glibc-devel.i686 for Xen < 4.15
> -        glibc-devel.i686 \
>          make \
>          binutils \
>          git \
> diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile
> index e1ec38a41445..48d0d50d005d 100644
> --- a/automation/build/suse/opensuse-leap.dockerfile
> +++ b/automation/build/suse/opensuse-leap.dockerfile
> @@ -28,8 +28,6 @@ RUN zypper install -y --no-recommends \
>          ghostscript \
>          glib2-devel \
>          glibc-devel \
> -        # glibc-devel-32bit for Xen < 4.15
> -        glibc-devel-32bit \
>          gzip \
>          hostname \
>          libaio-devel \
> diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile
> index f00e03eda7b1..53542ba1f4d9 100644
> --- a/automation/build/suse/opensuse-tumbleweed.dockerfile
> +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile
> @@ -26,8 +26,6 @@ RUN zypper install -y --no-recommends \
>          ghostscript \
>          glib2-devel \
>          glibc-devel \
> -        # glibc-devel-32bit for Xen < 4.15
> -        glibc-devel-32bit \
>          gzip \
>          hostname \
>          libaio-devel \
> diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/ubuntu/bionic.dockerfile
> index 77d7f933860c..910d3c4b5315 100644
> --- a/automation/build/ubuntu/bionic.dockerfile
> +++ b/automation/build/ubuntu/bionic.dockerfile
> @@ -31,8 +31,6 @@ RUN apt-get update && \
>          bin86 \
>          bcc \
>          liblzma-dev \
> -        # libc6-dev-i386 for Xen < 4.15
> -        libc6-dev-i386 \
>          libnl-3-dev \
>          ocaml-nox \
>          libfindlib-ocaml-dev \
> diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile
> index 30a9b8e84ffe..7c6a4d07566b 100644
> --- a/automation/build/ubuntu/focal.dockerfile
> +++ b/automation/build/ubuntu/focal.dockerfile
> @@ -31,8 +31,6 @@ RUN apt-get update && \
>          bin86 \
>          bcc \
>          liblzma-dev \
> -        # libc6-dev-i386 for Xen < 4.15
> -        libc6-dev-i386 \
>          libnl-3-dev \
>          ocaml-nox \
>          libfindlib-ocaml-dev \
> diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/ubuntu/trusty.dockerfile
> index 0d33578c4e1d..8bd8c085a781 100644
> --- a/automation/build/ubuntu/trusty.dockerfile
> +++ b/automation/build/ubuntu/trusty.dockerfile
> @@ -31,8 +31,6 @@ RUN apt-get update && \
>          bin86 \
>          bcc \
>          liblzma-dev \
> -        # libc6-dev-i386 for Xen < 4.15
> -        libc6-dev-i386 \
>          libnl-3-dev \
>          ocaml-nox \
>          libfindlib-ocaml-dev \
> diff --git a/automation/build/ubuntu/xenial.dockerfile b/automation/build/ubuntu/xenial.dockerfile
> index e8035434f804..f6296d32925c 100644
> --- a/automation/build/ubuntu/xenial.dockerfile
> +++ b/automation/build/ubuntu/xenial.dockerfile
> @@ -31,8 +31,6 @@ RUN apt-get update && \
>          bin86 \
>          bcc \
>          liblzma-dev \
> -        # libc6-dev-i386 for Xen < 4.15
> -        libc6-dev-i386 \
>          libnl-3-dev \
>          ocaml-nox \
>          libfindlib-ocaml-dev \
> 
> base-commit: 23cd1207e7f6ee3e51fb42e11dba8d7cdb28e1e5
> -- 
> 2.30.2
>