[PATCH 02/11] gitlab: drop aarch32 runner and associated bits

Alex Bennée posted 11 patches 4 weeks, 1 day ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Alexandre Iooss <erdnaxe@crans.org>, Mahmoud Mandour <ma.mandourr@gmail.com>, Pierrick Bouvier <pierrick.bouvier@linaro.org>, John Levon <john.levon@nutanix.com>, Thanos Makatos <thanos.makatos@nutanix.com>, "Cédric Le Goater" <clg@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Akihiko Odaki <odaki@rsg.ci.i.u-tokyo.ac.jp>, Dmitry Osipenko <dmitry.osipenko@collabora.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>
[PATCH 02/11] gitlab: drop aarch32 runner and associated bits
Posted by Alex Bennée 4 weeks, 1 day ago
While working out what hoops to jump through to get a full set of
aarch32 packages installed on the aarch64 runner it was pointed out 32
bit host support is deprecated. As the extra packages where needed for
system emulation (marked deprecated since 8.0!) there didn't seem much
point keeping this in.

While the full expunging of 32 bit host support will probably be done
for 11.0 we can at least reduce the CI burden a bit now.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .gitlab-ci.d/custom-runners.yml               |   1 -
 .../custom-runners/ubuntu-24.04-aarch32.yml   |  25 ----
 scripts/ci/setup/ubuntu/build-environment.yml |  17 ---
 .../setup/ubuntu/ubuntu-2204-armhf-cross.yml  | 127 ------------------
 4 files changed, 170 deletions(-)
 delete mode 100644 .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
 delete mode 100644 scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml

diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 3eb8216d571..142fbf4a242 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -31,4 +31,3 @@
 include:
   - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml'
   - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml'
-  - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml'
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
deleted file mode 100644
index 75029c9187e..00000000000
--- a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-# All ubuntu-24.04 jobs should run successfully in an environment
-# setup by the scripts/ci/setup/ubuntu/build-environment.yml task
-# "Install basic packages to build QEMU on Ubuntu 24.04"
-
-ubuntu-24.04-aarch32-all:
- extends: .custom_runner_template
- needs: []
- stage: build
- tags:
- - ubuntu_24.04
- - aarch32
- rules:
- - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
-   when: manual
-   allow_failure: true
- - if: "$AARCH32_RUNNER_AVAILABLE"
-   when: manual
-   allow_failure: true
- script:
- - mkdir build
- - cd build
- - ../configure --cross-prefix=arm-linux-gnueabihf-
-   || { cat config.log meson-logs/meson-log.txt; exit 1; }
- - make --output-sync -j`nproc --ignore=40`
- - make --output-sync -j`nproc --ignore=40` check
diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml
index 6042750cb4d..0f8ec5fab04 100644
--- a/scripts/ci/setup/ubuntu/build-environment.yml
+++ b/scripts/ci/setup/ubuntu/build-environment.yml
@@ -47,21 +47,4 @@
         - ansible_facts['distribution'] == 'Ubuntu'
         - ansible_facts['distribution_version'] == '24.04'
 
-    - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 24.04
-      package:
-        name:
-          - binutils-arm-linux-gnueabihf
-          - gcc-arm-linux-gnueabihf
-          - libblkid-dev:armhf
-          - libc6-dev:armhf
-          - libffi-dev:armhf
-          - libglib2.0-dev:armhf
-          - libmount-dev:armhf
-          - libpcre2-dev:armhf
-          - libpixman-1-dev:armhf
-          - zlib1g-dev:armhf
-      when:
-        - ansible_facts['distribution'] == 'Ubuntu'
-        - ansible_facts['distribution_version'] == '24.04'
-        - ansible_facts['architecture'] == 'aarch64'
 
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml b/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml
deleted file mode 100644
index 0cc34cd10b9..00000000000
--- a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-# THIS FILE WAS AUTO-GENERATED
-#
-#  $ lcitool variables --cross-arch armv7l ubuntu-2204 qemu
-#
-# https://gitlab.com/libvirt/libvirt-ci
-
-packages:
-  - bash
-  - bc
-  - bison
-  - bsdextrautils
-  - bzip2
-  - ca-certificates
-  - ccache
-  - dbus
-  - debianutils
-  - diffutils
-  - exuberant-ctags
-  - findutils
-  - flex
-  - gcc
-  - gcovr
-  - gettext
-  - git
-  - hostname
-  - libglib2.0-dev
-  - libpcre2-dev
-  - libsndio-dev
-  - libspice-protocol-dev
-  - llvm
-  - locales
-  - make
-  - meson
-  - mtools
-  - ncat
-  - ninja-build
-  - openssh-client
-  - pkgconf
-  - python3
-  - python3-numpy
-  - python3-opencv
-  - python3-pillow
-  - python3-pip
-  - python3-sphinx
-  - python3-sphinx-rtd-theme
-  - python3-tomli
-  - python3-venv
-  - python3-yaml
-  - rpm2cpio
-  - sed
-  - socat
-  - sparse
-  - swtpm
-  - tar
-  - tesseract-ocr
-  - tesseract-ocr-eng
-  - xorriso
-  - zstd
-  - gcc-arm-linux-gnueabihf
-  - libaio-dev:armhf
-  - libasan6:armhf
-  - libasound2-dev:armhf
-  - libattr1-dev:armhf
-  - libbpf-dev:armhf
-  - libbrlapi-dev:armhf
-  - libbz2-dev:armhf
-  - libc6-dev:armhf
-  - libcacard-dev:armhf
-  - libcap-ng-dev:armhf
-  - libcapstone-dev:armhf
-  - libcmocka-dev:armhf
-  - libcurl4-gnutls-dev:armhf
-  - libdaxctl-dev:armhf
-  - libdrm-dev:armhf
-  - libepoxy-dev:armhf
-  - libfdt-dev:armhf
-  - libffi-dev:armhf
-  - libfuse3-dev:armhf
-  - libgbm-dev:armhf
-  - libgcrypt20-dev:armhf
-  - libglib2.0-dev:armhf
-  - libglusterfs-dev:armhf
-  - libgnutls28-dev:armhf
-  - libgtk-3-dev:armhf
-  - libibumad-dev:armhf
-  - libibverbs-dev:armhf
-  - libiscsi-dev:armhf
-  - libjemalloc-dev:armhf
-  - libjpeg-turbo8-dev:armhf
-  - libjson-c-dev:armhf
-  - liblttng-ust-dev:armhf
-  - liblzo2-dev:armhf
-  - libncursesw5-dev:armhf
-  - libnfs-dev:armhf
-  - libnuma-dev:armhf
-  - libpam0g-dev:armhf
-  - libpipewire-0.3-dev:armhf
-  - libpixman-1-dev:armhf
-  - libpng-dev:armhf
-  - libpulse-dev:armhf
-  - librbd-dev:armhf
-  - librdmacm-dev:armhf
-  - libsasl2-dev:armhf
-  - libsdl2-dev:armhf
-  - libsdl2-image-dev:armhf
-  - libseccomp-dev:armhf
-  - libselinux1-dev:armhf
-  - libslirp-dev:armhf
-  - libsnappy-dev:armhf
-  - libspice-server-dev:armhf
-  - libssh-dev:armhf
-  - libsystemd-dev:armhf
-  - libtasn1-6-dev:armhf
-  - libubsan1:armhf
-  - libudev-dev:armhf
-  - liburing-dev:armhf
-  - libusb-1.0-0-dev:armhf
-  - libusbredirhost-dev:armhf
-  - libvdeplug-dev:armhf
-  - libvirglrenderer-dev:armhf
-  - libvte-2.91-dev:armhf
-  - libxen-dev:armhf
-  - libzstd-dev:armhf
-  - nettle-dev:armhf
-  - systemtap-sdt-dev:armhf
-  - zlib1g-dev:armhf
-
-- 
2.47.3


Re: [PATCH 02/11] gitlab: drop aarch32 runner and associated bits
Posted by Richard Henderson 3 weeks, 6 days ago
On 10/16/25 08:03, Alex Bennée wrote:
> diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml b/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml
> deleted file mode 100644
> index 0cc34cd10b9..00000000000
> --- a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml
> +++ /dev/null
> @@ -1,127 +0,0 @@
> -# THIS FILE WAS AUTO-GENERATED
> -#
> -#  $ lcitool variables --cross-arch armv7l ubuntu-2204 qemu
> -#
> -# https://gitlab.com/libvirt/libvirt-ci


Had this file been missing from tests/lcitool/refresh?

There appear to be no more references to ubuntu2204, which is still present in the refresh 
script.


r~

Re: [PATCH 02/11] gitlab: drop aarch32 runner and associated bits
Posted by Alex Bennée 3 weeks, 4 days ago
Richard Henderson <richard.henderson@linaro.org> writes:

> On 10/16/25 08:03, Alex Bennée wrote:
>> diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml b/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml
>> deleted file mode 100644
>> index 0cc34cd10b9..00000000000
>> --- a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml
>> +++ /dev/null
>> @@ -1,127 +0,0 @@
>> -# THIS FILE WAS AUTO-GENERATED
>> -#
>> -#  $ lcitool variables --cross-arch armv7l ubuntu-2204 qemu
>> -#
>> -# https://gitlab.com/libvirt/libvirt-ci
>
>
> Had this file been missing from tests/lcitool/refresh?

It appears to have been added by hand. In an earlier patch series I had
to make some changes to lcitool to be able to generate yaml:

  https://gitlab.com/stsquad/libvirt-ci/-/commits/cross-yaml-support

>
> There appear to be no more references to ubuntu2204, which is still
> present in the refresh script.

  lcitool dockerfile --layers all ubuntu-2204 qemu

points to:

  tests/tcg/docker/dockerfiles/ubuntu2204.docker

we will bump those in due course although probably not worth rushing
for 10.2.


>
>
> r~

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro
Re: [PATCH 02/11] gitlab: drop aarch32 runner and associated bits
Posted by Pierrick Bouvier 4 weeks, 1 day ago
On 10/16/25 8:03 AM, Alex Bennée wrote:
> While working out what hoops to jump through to get a full set of
> aarch32 packages installed on the aarch64 runner it was pointed out 32
> bit host support is deprecated. As the extra packages where needed for
> system emulation (marked deprecated since 8.0!) there didn't seem much
> point keeping this in.
> 
> While the full expunging of 32 bit host support will probably be done
> for 11.0 we can at least reduce the CI burden a bit now.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   .gitlab-ci.d/custom-runners.yml               |   1 -
>   .../custom-runners/ubuntu-24.04-aarch32.yml   |  25 ----
>   scripts/ci/setup/ubuntu/build-environment.yml |  17 ---
>   .../setup/ubuntu/ubuntu-2204-armhf-cross.yml  | 127 ------------------
>   4 files changed, 170 deletions(-)
>   delete mode 100644 .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
>   delete mode 100644 scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml
> 
> diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
> index 3eb8216d571..142fbf4a242 100644
> --- a/.gitlab-ci.d/custom-runners.yml
> +++ b/.gitlab-ci.d/custom-runners.yml
> @@ -31,4 +31,3 @@
>   include:
>     - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml'
>     - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml'
> -  - local: '/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml'
> diff --git a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
> deleted file mode 100644
> index 75029c9187e..00000000000
> --- a/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -# All ubuntu-24.04 jobs should run successfully in an environment
> -# setup by the scripts/ci/setup/ubuntu/build-environment.yml task
> -# "Install basic packages to build QEMU on Ubuntu 24.04"
> -
> -ubuntu-24.04-aarch32-all:
> - extends: .custom_runner_template
> - needs: []
> - stage: build
> - tags:
> - - ubuntu_24.04
> - - aarch32
> - rules:
> - - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
> -   when: manual
> -   allow_failure: true
> - - if: "$AARCH32_RUNNER_AVAILABLE"
> -   when: manual
> -   allow_failure: true
> - script:
> - - mkdir build
> - - cd build
> - - ../configure --cross-prefix=arm-linux-gnueabihf-
> -   || { cat config.log meson-logs/meson-log.txt; exit 1; }
> - - make --output-sync -j`nproc --ignore=40`
> - - make --output-sync -j`nproc --ignore=40` check
> diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml
> index 6042750cb4d..0f8ec5fab04 100644
> --- a/scripts/ci/setup/ubuntu/build-environment.yml
> +++ b/scripts/ci/setup/ubuntu/build-environment.yml
> @@ -47,21 +47,4 @@
>           - ansible_facts['distribution'] == 'Ubuntu'
>           - ansible_facts['distribution_version'] == '24.04'
>   
> -    - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 24.04
> -      package:
> -        name:
> -          - binutils-arm-linux-gnueabihf
> -          - gcc-arm-linux-gnueabihf
> -          - libblkid-dev:armhf
> -          - libc6-dev:armhf
> -          - libffi-dev:armhf
> -          - libglib2.0-dev:armhf
> -          - libmount-dev:armhf
> -          - libpcre2-dev:armhf
> -          - libpixman-1-dev:armhf
> -          - zlib1g-dev:armhf
> -      when:
> -        - ansible_facts['distribution'] == 'Ubuntu'
> -        - ansible_facts['distribution_version'] == '24.04'
> -        - ansible_facts['architecture'] == 'aarch64'
>   
> diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml b/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml
> deleted file mode 100644
> index 0cc34cd10b9..00000000000
> --- a/scripts/ci/setup/ubuntu/ubuntu-2204-armhf-cross.yml
> +++ /dev/null
> @@ -1,127 +0,0 @@
> -# THIS FILE WAS AUTO-GENERATED
> -#
> -#  $ lcitool variables --cross-arch armv7l ubuntu-2204 qemu
> -#
> -# https://gitlab.com/libvirt/libvirt-ci
> -
> -packages:
> -  - bash
> -  - bc
> -  - bison
> -  - bsdextrautils
> -  - bzip2
> -  - ca-certificates
> -  - ccache
> -  - dbus
> -  - debianutils
> -  - diffutils
> -  - exuberant-ctags
> -  - findutils
> -  - flex
> -  - gcc
> -  - gcovr
> -  - gettext
> -  - git
> -  - hostname
> -  - libglib2.0-dev
> -  - libpcre2-dev
> -  - libsndio-dev
> -  - libspice-protocol-dev
> -  - llvm
> -  - locales
> -  - make
> -  - meson
> -  - mtools
> -  - ncat
> -  - ninja-build
> -  - openssh-client
> -  - pkgconf
> -  - python3
> -  - python3-numpy
> -  - python3-opencv
> -  - python3-pillow
> -  - python3-pip
> -  - python3-sphinx
> -  - python3-sphinx-rtd-theme
> -  - python3-tomli
> -  - python3-venv
> -  - python3-yaml
> -  - rpm2cpio
> -  - sed
> -  - socat
> -  - sparse
> -  - swtpm
> -  - tar
> -  - tesseract-ocr
> -  - tesseract-ocr-eng
> -  - xorriso
> -  - zstd
> -  - gcc-arm-linux-gnueabihf
> -  - libaio-dev:armhf
> -  - libasan6:armhf
> -  - libasound2-dev:armhf
> -  - libattr1-dev:armhf
> -  - libbpf-dev:armhf
> -  - libbrlapi-dev:armhf
> -  - libbz2-dev:armhf
> -  - libc6-dev:armhf
> -  - libcacard-dev:armhf
> -  - libcap-ng-dev:armhf
> -  - libcapstone-dev:armhf
> -  - libcmocka-dev:armhf
> -  - libcurl4-gnutls-dev:armhf
> -  - libdaxctl-dev:armhf
> -  - libdrm-dev:armhf
> -  - libepoxy-dev:armhf
> -  - libfdt-dev:armhf
> -  - libffi-dev:armhf
> -  - libfuse3-dev:armhf
> -  - libgbm-dev:armhf
> -  - libgcrypt20-dev:armhf
> -  - libglib2.0-dev:armhf
> -  - libglusterfs-dev:armhf
> -  - libgnutls28-dev:armhf
> -  - libgtk-3-dev:armhf
> -  - libibumad-dev:armhf
> -  - libibverbs-dev:armhf
> -  - libiscsi-dev:armhf
> -  - libjemalloc-dev:armhf
> -  - libjpeg-turbo8-dev:armhf
> -  - libjson-c-dev:armhf
> -  - liblttng-ust-dev:armhf
> -  - liblzo2-dev:armhf
> -  - libncursesw5-dev:armhf
> -  - libnfs-dev:armhf
> -  - libnuma-dev:armhf
> -  - libpam0g-dev:armhf
> -  - libpipewire-0.3-dev:armhf
> -  - libpixman-1-dev:armhf
> -  - libpng-dev:armhf
> -  - libpulse-dev:armhf
> -  - librbd-dev:armhf
> -  - librdmacm-dev:armhf
> -  - libsasl2-dev:armhf
> -  - libsdl2-dev:armhf
> -  - libsdl2-image-dev:armhf
> -  - libseccomp-dev:armhf
> -  - libselinux1-dev:armhf
> -  - libslirp-dev:armhf
> -  - libsnappy-dev:armhf
> -  - libspice-server-dev:armhf
> -  - libssh-dev:armhf
> -  - libsystemd-dev:armhf
> -  - libtasn1-6-dev:armhf
> -  - libubsan1:armhf
> -  - libudev-dev:armhf
> -  - liburing-dev:armhf
> -  - libusb-1.0-0-dev:armhf
> -  - libusbredirhost-dev:armhf
> -  - libvdeplug-dev:armhf
> -  - libvirglrenderer-dev:armhf
> -  - libvte-2.91-dev:armhf
> -  - libxen-dev:armhf
> -  - libzstd-dev:armhf
> -  - nettle-dev:armhf
> -  - systemtap-sdt-dev:armhf
> -  - zlib1g-dev:armhf
> -

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>