[PATCH 0/7] testing and misc updates (docker, ansible, .git*, gitlab)

[PATCH 0/7] testing and misc updates (docker, ansible, .git*, gitlab)

[Alex Bennée]

My first set of patches for the development tree. Should be mostly
self-explanatory. We still need to apply the upstream COPYING patch
the u-boot-sam460ex code but we should decide if its worth mirroring
or should we just treat the copy as fully "ours".

Hopefully I'll have the new aarch64 runner online by Friday and ready
for the switchover.

Hopefully I'll also be able to pick up Gustavo's reverse debug test
fixes by then as well.

Alex.

Alex Bennée (7):
  .gitpublish: use origin/master as default base
  .gitmodules: restore qemu-project mirror of u-boot
  .gitmodules: restore qemu-project mirror of u-boot-sam460ex
  tests/lcitool: drop 64 bit guests from i686 cross build
  tests/lcitool: bump custom runner packages to Ubuntu 24.04
  gitlab: move custom runners to Ubuntu 24.04
  scripts/ci: use recommended registration command

 .gitlab-ci.d/custom-runners.yml               |  6 ++--
 ...4-aarch32.yml => ubuntu-24.04-aarch32.yml} |  8 ++---
 ...4-aarch64.yml => ubuntu-24.04-aarch64.yml} | 32 +++++++++----------
 ...22.04-s390x.yml => ubuntu-24.04-s390x.yml} | 28 ++++++++--------
 .gitmodules                                   |  6 ++--
 .gitpublish                                   | 16 +++++-----
 scripts/ci/setup/gitlab-runner.yml            | 12 ++-----
 scripts/ci/setup/ubuntu/build-environment.yml | 12 +++----
 ...-aarch64.yaml => ubuntu-2404-aarch64.yaml} |  4 ++-
 ...2204-s390x.yaml => ubuntu-2404-s390x.yaml} |  4 ++-
 scripts/ci/setup/vars.yml.template            |  5 +--
 .../dockerfiles/debian-i686-cross.docker      |  2 +-
 tests/lcitool/refresh                         |  6 ++--
 13 files changed, 69 insertions(+), 72 deletions(-)
 rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch32.yml => ubuntu-24.04-aarch32.yml} (78%)
 rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch64.yml => ubuntu-24.04-aarch64.yml} (89%)
 rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-s390x.yml => ubuntu-24.04-s390x.yml} (88%)
 rename scripts/ci/setup/ubuntu/{ubuntu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} (96%)
 rename scripts/ci/setup/ubuntu/{ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} (96%)

-- 
2.47.3

[PATCH 1/7] .gitpublish: use origin/master as default base

[Alex Bennée]

This is very much the result of my recent fat finger but I think it's
safer to assume that origin/master points to a recent commit (or at
least a commit a given branch is based on) than master.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 .gitpublish | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitpublish b/.gitpublish
index a13f8c7c0ec..a3adb21ffa1 100644
--- a/.gitpublish
+++ b/.gitpublish
@@ -4,48 +4,48 @@
 # See https://github.com/stefanha/git-publish for more information
 #
 [gitpublishprofile "default"]
-base = master
+base = origin/master
 to = qemu-devel@nongnu.org
 cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
 
 [gitpublishprofile "rfc"]
-base = master
+base = origin/master
 prefix = RFC PATCH
 to = qemu-devel@nongnu.org
 cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
 
 [gitpublishprofile "stable"]
-base = master
+base = origin/master
 to = qemu-devel@nongnu.org
 cc = qemu-stable@nongnu.org
 cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
 
 [gitpublishprofile "trivial"]
-base = master
+base = origin/master
 to = qemu-devel@nongnu.org
 cc = qemu-trivial@nongnu.org
 cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
 
 [gitpublishprofile "block"]
-base = master
+base = origin/master
 to = qemu-devel@nongnu.org
 cc = qemu-block@nongnu.org
 cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
 
 [gitpublishprofile "arm"]
-base = master
+base = origin/master
 to = qemu-devel@nongnu.org
 cc = qemu-arm@nongnu.org
 cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
 
 [gitpublishprofile "s390"]
-base = master
+base = origin/master
 to = qemu-devel@nongnu.org
 cc = qemu-s390@nongnu.org
 cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
 
 [gitpublishprofile "ppc"]
-base = master
+base = origin/master
 to = qemu-devel@nongnu.org
 cc = qemu-ppc@nongnu.org
 cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null
-- 
2.47.3

[PATCH 2/7] .gitmodules: restore qemu-project mirror of u-boot

[Alex Bennée]

With this change also reference the upstream repo.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .gitmodules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index e27dfe8c2c1..e51abe65258 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -15,7 +15,8 @@
 	url = https://gitlab.com/qemu-project/qemu-palcode.git
 [submodule "roms/u-boot"]
 	path = roms/u-boot
-	url = https://gitlab.com/qemu-project-mirrors/u-boot.git
+        # upstream is https://github.com/u-boot/u-boot
+	url = https://gitlab.com/qemu-project/u-boot.git
 [submodule "roms/skiboot"]
 	path = roms/skiboot
 	url = https://gitlab.com/qemu-project/skiboot.git
-- 
2.47.3

[PATCH 3/7] .gitmodules: restore qemu-project mirror of u-boot-sam460ex

[Alex Bennée]

With this change also reference the upstream repo.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .gitmodules | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index e51abe65258..c307216d173 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,7 +28,8 @@
 	url = https://gitlab.com/qemu-project/seabios-hppa.git
 [submodule "roms/u-boot-sam460ex"]
 	path = roms/u-boot-sam460ex
-	url = https://gitlab.com/qemu-project-mirrors/u-boot-sam460ex.git
+        # upstream is https://github.com/zbalaton/u-boot-sam460ex
+	url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
 [submodule "roms/edk2"]
 	path = roms/edk2
 	url = https://gitlab.com/qemu-project/edk2.git
-- 
2.47.3

[PATCH 4/7] tests/lcitool: drop 64 bit guests from i686 cross build

[Alex Bennée]

With only TCG available we can't support 64 bit guests on a 32 bit
host.

Fixes: 5c27baf9519 (docs/about/deprecated: Deprecate 32-bit x86 hosts for system emulation)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/dockerfiles/debian-i686-cross.docker | 2 +-
 tests/lcitool/refresh                             | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
index 4e8b3a8293d..2998764065f 100644
--- a/tests/docker/dockerfiles/debian-i686-cross.docker
+++ b/tests/docker/dockerfiles/debian-i686-cross.docker
@@ -178,7 +178,7 @@ ENV ABI "i686-linux-gnu"
 ENV MESON_OPTS "--cross-file=i686-linux-gnu"
 ENV RUST_TARGET "i686-unknown-linux-gnu"
 ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-linux-gnu-
-ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user
+ENV DEF_TARGET_LIST i386-softmmu,i386-linux-user
 # As a final step configure the user (if env is defined)
 ARG USER
 ARG UID
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 645959318a3..185a47cebe6 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -216,8 +216,6 @@ try:
     generate_dockerfile("debian-i686-cross", "debian-13",
                         cross="i686",
                         trailer=cross_build("i686-linux-gnu-",
-                                            "x86_64-softmmu,"
-                                            "x86_64-linux-user,"
                                             "i386-softmmu,i386-linux-user"))
 
     # mips no longer supported in debian-13
-- 
2.47.3

Re: [PATCH 4/7] tests/lcitool: drop 64 bit guests from i686 cross build

[Marc-André Lureau]

On Wed, Oct 1, 2025 at 9:12 PM Alex Bennée <alex.bennee@linaro.org> wrote:
>
> With only TCG available we can't support 64 bit guests on a 32 bit
> host.
>
> Fixes: 5c27baf9519 (docs/about/deprecated: Deprecate 32-bit x86 hosts for system emulation)
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>

> ---
>  tests/docker/dockerfiles/debian-i686-cross.docker | 2 +-
>  tests/lcitool/refresh                             | 2 --
>  2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker
> index 4e8b3a8293d..2998764065f 100644
> --- a/tests/docker/dockerfiles/debian-i686-cross.docker
> +++ b/tests/docker/dockerfiles/debian-i686-cross.docker
> @@ -178,7 +178,7 @@ ENV ABI "i686-linux-gnu"
>  ENV MESON_OPTS "--cross-file=i686-linux-gnu"
>  ENV RUST_TARGET "i686-unknown-linux-gnu"
>  ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-linux-gnu-
> -ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user
> +ENV DEF_TARGET_LIST i386-softmmu,i386-linux-user
>  # As a final step configure the user (if env is defined)
>  ARG USER
>  ARG UID
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index 645959318a3..185a47cebe6 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -216,8 +216,6 @@ try:
>      generate_dockerfile("debian-i686-cross", "debian-13",
>                          cross="i686",
>                          trailer=cross_build("i686-linux-gnu-",
> -                                            "x86_64-softmmu,"
> -                                            "x86_64-linux-user,"
>                                              "i386-softmmu,i386-linux-user"))
>
>      # mips no longer supported in debian-13
> --
> 2.47.3
>
>


-- 
Marc-André Lureau

Re: [PATCH 4/7] tests/lcitool: drop 64 bit guests from i686 cross build

[Philippe Mathieu-Daudé]

On 1/10/25 19:09, Alex Bennée wrote:
> With only TCG available we can't support 64 bit guests on a 32 bit
> host.
> 
> Fixes: 5c27baf9519 (docs/about/deprecated: Deprecate 32-bit x86 hosts for system emulation)

AFAICT this is only deprecated so far. Should this patch go with
a series taking care to remove "System emulation on 32-bit x86
hosts"?

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/docker/dockerfiles/debian-i686-cross.docker | 2 +-
>   tests/lcitool/refresh                             | 2 --
>   2 files changed, 1 insertion(+), 3 deletions(-)

Re: [PATCH 4/7] tests/lcitool: drop 64 bit guests from i686 cross build

[Richard Henderson]

On 10/1/25 10:09, Alex Bennée wrote:
> With only TCG available we can't support 64 bit guests on a 32 bit
> host.
> 
> Fixes: 5c27baf9519 (docs/about/deprecated: Deprecate 32-bit x86 hosts for system emulation)
> Signed-off-by: Alex Bennée<alex.bennee@linaro.org>
> ---
>   tests/docker/dockerfiles/debian-i686-cross.docker | 2 +-
>   tests/lcitool/refresh                             | 2 --
>   2 files changed, 1 insertion(+), 3 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

[PATCH 5/7] tests/lcitool: bump custom runner packages to Ubuntu 24.04

[Alex Bennée]

In anticipation of new runners lets move to a newer Ubuntu LTS.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 scripts/ci/setup/gitlab-runner.yml                   |  2 +-
 scripts/ci/setup/ubuntu/build-environment.yml        | 12 ++++++------
 ...tu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} |  4 +++-
 ...ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} |  4 +++-
 tests/lcitool/refresh                                |  4 ++--
 5 files changed, 15 insertions(+), 11 deletions(-)
 rename scripts/ci/setup/ubuntu/{ubuntu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} (96%)
 rename scripts/ci/setup/ubuntu/{ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} (96%)

diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml
index 57e7faebf10..7350f6cff4a 100644
--- a/scripts/ci/setup/gitlab-runner.yml
+++ b/scripts/ci/setup/gitlab-runner.yml
@@ -103,7 +103,7 @@
       when:
         - ansible_facts['distribution'] == 'Ubuntu'
         - ansible_facts['architecture'] == 'aarch64'
-        - ansible_facts['distribution_version'] == '22.04'
+        - ansible_facts['distribution_version'] == '24.04'
 
     - name: Install the gitlab-runner service using its own functionality
       command: "/usr/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner"
diff --git a/scripts/ci/setup/ubuntu/build-environment.yml b/scripts/ci/setup/ubuntu/build-environment.yml
index 56b51609e38..6042750cb4d 100644
--- a/scripts/ci/setup/ubuntu/build-environment.yml
+++ b/scripts/ci/setup/ubuntu/build-environment.yml
@@ -35,19 +35,19 @@
     # the package lists are updated by "make lcitool-refresh"
     - name: Include package lists based on OS and architecture
       include_vars:
-        file: "ubuntu-2204-{{ ansible_facts['architecture'] }}.yaml"
+        file: "ubuntu-2404-{{ ansible_facts['architecture'] }}.yaml"
       when:
         - ansible_facts['distribution'] == 'Ubuntu'
-        - ansible_facts['distribution_version'] == '22.04'
+        - ansible_facts['distribution_version'] == '24.04'
 
-    - name: Install packages for QEMU on Ubuntu 22.04
+    - name: Install packages for QEMU on Ubuntu 24.04
       package:
         name: "{{ packages }}"
       when:
         - ansible_facts['distribution'] == 'Ubuntu'
-        - ansible_facts['distribution_version'] == '22.04'
+        - ansible_facts['distribution_version'] == '24.04'
 
-    - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 22.04
+    - name: Install armhf cross-compile packages to build QEMU on AArch64 Ubuntu 24.04
       package:
         name:
           - binutils-arm-linux-gnueabihf
@@ -62,6 +62,6 @@
           - zlib1g-dev:armhf
       when:
         - ansible_facts['distribution'] == 'Ubuntu'
-        - ansible_facts['distribution_version'] == '22.04'
+        - ansible_facts['distribution_version'] == '24.04'
         - ansible_facts['architecture'] == 'aarch64'
 
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
similarity index 96%
rename from scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
rename to scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
index 2ca4a5392f5..ce632d97108 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2204-aarch64.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-aarch64.yaml
@@ -1,12 +1,13 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool variables --host-arch aarch64 ubuntu-2204 qemu
+#  $ lcitool variables --host-arch aarch64 ubuntu-2404 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
 packages:
   - bash
   - bc
+  - bindgen
   - bison
   - bsdextrautils
   - bzip2
@@ -92,6 +93,7 @@ packages:
   - libvdeplug-dev
   - libvirglrenderer-dev
   - libvte-2.91-dev
+  - libxdp-dev
   - libxen-dev
   - libzstd-dev
   - llvm
diff --git a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
similarity index 96%
rename from scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
rename to scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
index 7198fbbcbb7..f45f75c9602 100644
--- a/scripts/ci/setup/ubuntu/ubuntu-2204-s390x.yaml
+++ b/scripts/ci/setup/ubuntu/ubuntu-2404-s390x.yaml
@@ -1,12 +1,13 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool variables --host-arch s390x ubuntu-2204 qemu
+#  $ lcitool variables --host-arch s390x ubuntu-2404 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
 packages:
   - bash
   - bc
+  - bindgen
   - bison
   - bsdextrautils
   - bzip2
@@ -91,6 +92,7 @@ packages:
   - libvdeplug-dev
   - libvirglrenderer-dev
   - libvte-2.91-dev
+  - libxdp-dev
   - libzstd-dev
   - llvm
   - locales
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 185a47cebe6..056cfb6e9d7 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -270,8 +270,8 @@ try:
     #
     # Ansible package lists
     #
-    generate_yaml("ubuntu", "ubuntu-2204", "aarch64")
-    generate_yaml("ubuntu", "ubuntu-2204", "s390x")
+    generate_yaml("ubuntu", "ubuntu-2404", "aarch64")
+    generate_yaml("ubuntu", "ubuntu-2404", "s390x")
 
 
     sys.exit(0)
-- 
2.47.3

Re: [PATCH 5/7] tests/lcitool: bump custom runner packages to Ubuntu 24.04

[Richard Henderson]

On 10/1/25 10:09, Alex Bennée wrote:
> In anticipation of new runners lets move to a newer Ubuntu LTS.
> 
> Signed-off-by: Alex Bennée<alex.bennee@linaro.org>
> ---
>   scripts/ci/setup/gitlab-runner.yml                   |  2 +-
>   scripts/ci/setup/ubuntu/build-environment.yml        | 12 ++++++------
>   ...tu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} |  4 +++-
>   ...ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} |  4 +++-
>   tests/lcitool/refresh                                |  4 ++--
>   5 files changed, 15 insertions(+), 11 deletions(-)
>   rename scripts/ci/setup/ubuntu/{ubuntu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} (96%)
>   rename scripts/ci/setup/ubuntu/{ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} (96%)
> 
> diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml
> index 57e7faebf10..7350f6cff4a 100644
> --- a/scripts/ci/setup/gitlab-runner.yml
> +++ b/scripts/ci/setup/gitlab-runner.yml
> @@ -103,7 +103,7 @@
>         when:
>           - ansible_facts['distribution'] == 'Ubuntu'
>           - ansible_facts['architecture'] == 'aarch64'
> -        - ansible_facts['distribution_version'] == '22.04'
> +        - ansible_facts['distribution_version'] == '24.04'
>   

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH 5/7] tests/lcitool: bump custom runner packages to Ubuntu 24.04

[Thomas Huth]

On 01/10/2025 19.09, Alex Bennée wrote:
> In anticipation of new runners lets move to a newer Ubuntu LTS.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   scripts/ci/setup/gitlab-runner.yml                   |  2 +-
>   scripts/ci/setup/ubuntu/build-environment.yml        | 12 ++++++------
>   ...tu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} |  4 +++-
>   ...ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} |  4 +++-
>   tests/lcitool/refresh                                |  4 ++--
>   5 files changed, 15 insertions(+), 11 deletions(-)
>   rename scripts/ci/setup/ubuntu/{ubuntu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} (96%)
>   rename scripts/ci/setup/ubuntu/{ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} (96%)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 5/7] tests/lcitool: bump custom runner packages to Ubuntu 24.04

[Philippe Mathieu-Daudé]

On 1/10/25 19:09, Alex Bennée wrote:
> In anticipation of new runners lets move to a newer Ubuntu LTS.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   scripts/ci/setup/gitlab-runner.yml                   |  2 +-
>   scripts/ci/setup/ubuntu/build-environment.yml        | 12 ++++++------
>   ...tu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} |  4 +++-
>   ...ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} |  4 +++-
>   tests/lcitool/refresh                                |  4 ++--
>   5 files changed, 15 insertions(+), 11 deletions(-)
>   rename scripts/ci/setup/ubuntu/{ubuntu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} (96%)
>   rename scripts/ci/setup/ubuntu/{ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} (96%)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 6/7] gitlab: move custom runners to Ubuntu 24.04

[Alex Bennée]

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 .gitlab-ci.d/custom-runners.yml               |  6 ++--
 ...4-aarch32.yml => ubuntu-24.04-aarch32.yml} |  8 ++---
 ...4-aarch64.yml => ubuntu-24.04-aarch64.yml} | 32 +++++++++----------
 ...22.04-s390x.yml => ubuntu-24.04-s390x.yml} | 28 ++++++++--------
 4 files changed, 37 insertions(+), 37 deletions(-)
 rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch32.yml => ubuntu-24.04-aarch32.yml} (78%)
 rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch64.yml => ubuntu-24.04-aarch64.yml} (89%)
 rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-s390x.yml => ubuntu-24.04-s390x.yml} (88%)

diff --git a/.gitlab-ci.d/custom-runners.yml b/.gitlab-ci.d/custom-runners.yml
index 2d493f70f7a..3eb8216d571 100644
--- a/.gitlab-ci.d/custom-runners.yml
+++ b/.gitlab-ci.d/custom-runners.yml
@@ -29,6 +29,6 @@
       junit: build/meson-logs/*.junit.xml
 
 include:
-  - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml'
-  - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml'
-  - local: '/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml'
+  - 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-22.04-aarch32.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
similarity index 78%
rename from .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
rename to .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
index 8727687e2b4..75029c9187e 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch32.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch32.yml
@@ -1,13 +1,13 @@
-# All ubuntu-22.04 jobs should run successfully in an environment
+# 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 22.04"
+# "Install basic packages to build QEMU on Ubuntu 24.04"
 
-ubuntu-22.04-aarch32-all:
+ubuntu-24.04-aarch32-all:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - aarch32
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml
similarity index 89%
rename from .gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
rename to .gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml
index ca2f1404710..d26c7827f45 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-aarch64.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-aarch64.yml
@@ -1,13 +1,13 @@
-# All ubuntu-22.04 jobs should run successfully in an environment
+# 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 22.04"
+# "Install basic packages to build QEMU on Ubuntu 24.04"
 
-ubuntu-22.04-aarch64-all-linux-static:
+ubuntu-24.04-aarch64-all-linux-static:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - aarch64
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -23,12 +23,12 @@ ubuntu-22.04-aarch64-all-linux-static:
  - make check-tcg
  - make --output-sync -j`nproc --ignore=40` check
 
-ubuntu-22.04-aarch64-all:
+ubuntu-24.04-aarch64-all:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - aarch64
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -45,12 +45,12 @@ ubuntu-22.04-aarch64-all:
  - make --output-sync -j`nproc --ignore=40`
  - make --output-sync -j`nproc --ignore=40` check
 
-ubuntu-22.04-aarch64-without-defaults:
+ubuntu-24.04-aarch64-without-defaults:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - aarch64
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -67,12 +67,12 @@ ubuntu-22.04-aarch64-without-defaults:
  - make --output-sync -j`nproc --ignore=40`
  - make --output-sync -j`nproc --ignore=40` check
 
-ubuntu-22.04-aarch64-alldbg:
+ubuntu-24.04-aarch64-alldbg:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - aarch64
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -86,12 +86,12 @@ ubuntu-22.04-aarch64-alldbg:
  - make --output-sync -j`nproc --ignore=40`
  - make --output-sync -j`nproc --ignore=40` check
 
-ubuntu-22.04-aarch64-clang:
+ubuntu-24.04-aarch64-clang:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - aarch64
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -108,11 +108,11 @@ ubuntu-22.04-aarch64-clang:
  - make --output-sync -j`nproc --ignore=40`
  - make --output-sync -j`nproc --ignore=40` check
 
-ubuntu-22.04-aarch64-tci:
+ubuntu-24.04-aarch64-tci:
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - aarch64
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -128,12 +128,12 @@ ubuntu-22.04-aarch64-tci:
    || { cat config.log meson-logs/meson-log.txt; exit 1; }
  - make --output-sync -j`nproc --ignore=40`
 
-ubuntu-22.04-aarch64-notcg:
+ubuntu-24.04-aarch64-notcg:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - aarch64
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
diff --git a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml b/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml
similarity index 88%
rename from .gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
rename to .gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml
index e62ff1763fa..45dbee17880 100644
--- a/.gitlab-ci.d/custom-runners/ubuntu-22.04-s390x.yml
+++ b/.gitlab-ci.d/custom-runners/ubuntu-24.04-s390x.yml
@@ -1,13 +1,13 @@
-# All ubuntu-22.04 jobs should run successfully in an environment
+# 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 22.04"
+# "Install basic packages to build QEMU on Ubuntu 24.04"
 
-ubuntu-22.04-s390x-all-linux:
+ubuntu-24.04-s390x-all-linux:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - s390x
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -21,12 +21,12 @@ ubuntu-22.04-s390x-all-linux:
  - make --output-sync check-tcg
  - make --output-sync -j`nproc` check
 
-ubuntu-22.04-s390x-all-system:
+ubuntu-24.04-s390x-all-system:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - s390x
  timeout: 75m
  rules:
@@ -42,12 +42,12 @@ ubuntu-22.04-s390x-all-system:
  - make --output-sync -j`nproc`
  - make --output-sync -j`nproc` check
 
-ubuntu-22.04-s390x-alldbg:
+ubuntu-24.04-s390x-alldbg:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - s390x
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -65,12 +65,12 @@ ubuntu-22.04-s390x-alldbg:
  - make --output-sync -j`nproc`
  - make --output-sync -j`nproc` check
 
-ubuntu-22.04-s390x-clang:
+ubuntu-24.04-s390x-clang:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - s390x
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -87,11 +87,11 @@ ubuntu-22.04-s390x-clang:
  - make --output-sync -j`nproc`
  - make --output-sync -j`nproc` check
 
-ubuntu-22.04-s390x-tci:
+ubuntu-24.04-s390x-tci:
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - s390x
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
@@ -107,12 +107,12 @@ ubuntu-22.04-s390x-tci:
    || { cat config.log meson-logs/meson-log.txt; exit 1; }
  - make --output-sync -j`nproc`
 
-ubuntu-22.04-s390x-notcg:
+ubuntu-24.04-s390x-notcg:
  extends: .custom_runner_template
  needs: []
  stage: build
  tags:
- - ubuntu_22.04
+ - ubuntu_24.04
  - s390x
  rules:
  - if: '$CI_PROJECT_NAMESPACE == "qemu-project" && $CI_COMMIT_BRANCH =~ /^staging/'
-- 
2.47.3

Re: [PATCH 6/7] gitlab: move custom runners to Ubuntu 24.04

[Richard Henderson]

On 10/1/25 10:09, Alex Bennée wrote:
> Signed-off-by: Alex Bennée<alex.bennee@linaro.org>
> ---
>   .gitlab-ci.d/custom-runners.yml               |  6 ++--
>   ...4-aarch32.yml => ubuntu-24.04-aarch32.yml} |  8 ++---
>   ...4-aarch64.yml => ubuntu-24.04-aarch64.yml} | 32 +++++++++----------
>   ...22.04-s390x.yml => ubuntu-24.04-s390x.yml} | 28 ++++++++--------
>   4 files changed, 37 insertions(+), 37 deletions(-)
>   rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch32.yml => ubuntu-24.04-aarch32.yml} (78%)
>   rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch64.yml => ubuntu-24.04-aarch64.yml} (89%)
>   rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-s390x.yml => ubuntu-24.04-s390x.yml} (88%)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~

Re: [PATCH 6/7] gitlab: move custom runners to Ubuntu 24.04

[Thomas Huth]

On 01/10/2025 19.09, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   .gitlab-ci.d/custom-runners.yml               |  6 ++--
>   ...4-aarch32.yml => ubuntu-24.04-aarch32.yml} |  8 ++---
>   ...4-aarch64.yml => ubuntu-24.04-aarch64.yml} | 32 +++++++++----------
>   ...22.04-s390x.yml => ubuntu-24.04-s390x.yml} | 28 ++++++++--------
>   4 files changed, 37 insertions(+), 37 deletions(-)
>   rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch32.yml => ubuntu-24.04-aarch32.yml} (78%)
>   rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch64.yml => ubuntu-24.04-aarch64.yml} (89%)
>   rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-s390x.yml => ubuntu-24.04-s390x.yml} (88%)

Reviewed-by: Thomas Huth <thuth@redhat.com>

Re: [PATCH 6/7] gitlab: move custom runners to Ubuntu 24.04

[Philippe Mathieu-Daudé]

On 1/10/25 19:09, Alex Bennée wrote:
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   .gitlab-ci.d/custom-runners.yml               |  6 ++--
>   ...4-aarch32.yml => ubuntu-24.04-aarch32.yml} |  8 ++---
>   ...4-aarch64.yml => ubuntu-24.04-aarch64.yml} | 32 +++++++++----------
>   ...22.04-s390x.yml => ubuntu-24.04-s390x.yml} | 28 ++++++++--------
>   4 files changed, 37 insertions(+), 37 deletions(-)
>   rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch32.yml => ubuntu-24.04-aarch32.yml} (78%)
>   rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch64.yml => ubuntu-24.04-aarch64.yml} (89%)
>   rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-s390x.yml => ubuntu-24.04-s390x.yml} (88%)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

[PATCH 7/7] scripts/ci: use recommended registration command

[Alex Bennée]

The registration-token method is being deprecated:

  https://docs.gitlab.com/ci/runners/new_creation_workflow/

As a result we can drop a bunch of the descriptive stuff as that is
entered on the web UI. We don't need a secondary runner if we just
create one with both aarch64 and aarch32 tags.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 scripts/ci/setup/gitlab-runner.yml | 12 ++----------
 scripts/ci/setup/vars.yml.template |  5 +++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/scripts/ci/setup/gitlab-runner.yml b/scripts/ci/setup/gitlab-runner.yml
index 7350f6cff4a..7025935487a 100644
--- a/scripts/ci/setup/gitlab-runner.yml
+++ b/scripts/ci/setup/gitlab-runner.yml
@@ -16,7 +16,7 @@
   tasks:
     - debug:
         msg: 'Checking for a valid GitLab registration token'
-      failed_when: "gitlab_runner_registration_token == 'PLEASE_PROVIDE_A_VALID_TOKEN'"
+      failed_when: "gitlab_runner_authentication_token == 'PLEASE_PROVIDE_A_VALID_TOKEN'"
 
     - name: Create a group for the gitlab-runner service
       group:
@@ -95,15 +95,7 @@
 
     # Register Runners
     - name: Register the gitlab-runner
-      command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list {{ ansible_facts[\"architecture\"] }},{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'"
-
-    # The secondary runner will still run under the single gitlab-runner service
-    - name: Register secondary gitlab-runner
-      command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --registration-token {{ gitlab_runner_registration_token }} --executor shell --tag-list aarch32,{{ ansible_facts[\"distribution\"]|lower }}_{{ ansible_facts[\"distribution_version\"] }} --description '{{ ansible_facts[\"distribution\"] }} {{ ansible_facts[\"distribution_version\"] }} {{ ansible_facts[\"architecture\"] }} ({{ ansible_facts[\"os_family\"] }})'"
-      when:
-        - ansible_facts['distribution'] == 'Ubuntu'
-        - ansible_facts['architecture'] == 'aarch64'
-        - ansible_facts['distribution_version'] == '24.04'
+      command: "/usr/bin/gitlab-runner register --non-interactive --url {{ gitlab_runner_server_url }} --token {{ gitlab_runner_authentication_token }} --executor shell"
 
     - name: Install the gitlab-runner service using its own functionality
       command: "/usr/bin/gitlab-runner install --user gitlab-runner --working-directory /home/gitlab-runner"
diff --git a/scripts/ci/setup/vars.yml.template b/scripts/ci/setup/vars.yml.template
index 4b355fb80fd..e9ddc05f3b0 100644
--- a/scripts/ci/setup/vars.yml.template
+++ b/scripts/ci/setup/vars.yml.template
@@ -6,5 +6,6 @@ ansible_to_gitlab_arch:
   x86_64: amd64
   aarch64: arm64
   s390x: s390x
-# A unique token made available by GitLab to your project for registering runners
-gitlab_runner_registration_token: PLEASE_PROVIDE_A_VALID_TOKEN
+# A unique token made obtained from GitLab for each runner
+# see: https://gitlab.com/PROJECT/REPO/-/runners/new
+gitlab_runner_authentication_token: PLEASE_PROVIDE_A_VALID_TOKEN
-- 
2.47.3

Re: [PATCH 0/7] testing and misc updates (docker, ansible, .git*, gitlab)

[BALATON Zoltan]

[-- Attachment #1: Type: text/plain, Size: 2924 bytes --]

On Wed, 1 Oct 2025, Alex Bennée wrote:
> My first set of patches for the development tree. Should be mostly
> self-explanatory. We still need to apply the upstream COPYING patch
> the u-boot-sam460ex code but we should decide if its worth mirroring
> or should we just treat the copy as fully "ours".

Which COPYING patch do you refer to? I have the upstream because when I 
submitted this I was told to do it this way instead of adding the u-boot 
sources to the QEMU tree. It can't be merged with the official u-boot used 
for e500 because it has sam460ex specific patches from the machine vendor 
which only supports this u-boot version. There are some updates from the 
vendor for real machine which I plan to add eventually but it's still 
based on an older u-boot version. With mirroring I can update upstream and 
send one patch to update the binary once it's mirrored, otherwise I'd need 
to send patches for each update and rely on somebody to merge them.

Regards,
BALATON Zoltan

> Hopefully I'll have the new aarch64 runner online by Friday and ready
> for the switchover.
>
> Hopefully I'll also be able to pick up Gustavo's reverse debug test
> fixes by then as well.
>
> Alex.
>
> Alex Bennée (7):
>  .gitpublish: use origin/master as default base
>  .gitmodules: restore qemu-project mirror of u-boot
>  .gitmodules: restore qemu-project mirror of u-boot-sam460ex
>  tests/lcitool: drop 64 bit guests from i686 cross build
>  tests/lcitool: bump custom runner packages to Ubuntu 24.04
>  gitlab: move custom runners to Ubuntu 24.04
>  scripts/ci: use recommended registration command
>
> .gitlab-ci.d/custom-runners.yml               |  6 ++--
> ...4-aarch32.yml => ubuntu-24.04-aarch32.yml} |  8 ++---
> ...4-aarch64.yml => ubuntu-24.04-aarch64.yml} | 32 +++++++++----------
> ...22.04-s390x.yml => ubuntu-24.04-s390x.yml} | 28 ++++++++--------
> .gitmodules                                   |  6 ++--
> .gitpublish                                   | 16 +++++-----
> scripts/ci/setup/gitlab-runner.yml            | 12 ++-----
> scripts/ci/setup/ubuntu/build-environment.yml | 12 +++----
> ...-aarch64.yaml => ubuntu-2404-aarch64.yaml} |  4 ++-
> ...2204-s390x.yaml => ubuntu-2404-s390x.yaml} |  4 ++-
> scripts/ci/setup/vars.yml.template            |  5 +--
> .../dockerfiles/debian-i686-cross.docker      |  2 +-
> tests/lcitool/refresh                         |  6 ++--
> 13 files changed, 69 insertions(+), 72 deletions(-)
> rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch32.yml => ubuntu-24.04-aarch32.yml} (78%)
> rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch64.yml => ubuntu-24.04-aarch64.yml} (89%)
> rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-s390x.yml => ubuntu-24.04-s390x.yml} (88%)
> rename scripts/ci/setup/ubuntu/{ubuntu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} (96%)
> rename scripts/ci/setup/ubuntu/{ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} (96%)
>
>

Re: [PATCH 0/7] testing and misc updates (docker, ansible, .git*, gitlab)

[Daniel P. Berrangé]

On Wed, Oct 01, 2025 at 07:56:21PM +0200, BALATON Zoltan wrote:
> On Wed, 1 Oct 2025, Alex Bennée wrote:
> > My first set of patches for the development tree. Should be mostly
> > self-explanatory. We still need to apply the upstream COPYING patch
> > the u-boot-sam460ex code but we should decide if its worth mirroring
> > or should we just treat the copy as fully "ours".
> 
> Which COPYING patch do you refer to? I have the upstream because when I
> submitted this I was told to do it this way instead of adding the u-boot
> sources to the QEMU tree. It can't be merged with the official u-boot used
> for e500 because it has sam460ex specific patches from the machine vendor
> which only supports this u-boot version. There are some updates from the
> vendor for real machine which I plan to add eventually but it's still based
> on an older u-boot version. With mirroring I can update upstream and send
> one patch to update the binary once it's mirrored, otherwise I'd need to
> send patches for each update and rely on somebody to merge them.

I opened this:

  https://gitlab.com/qemu-project/u-boot-sam460ex/-/merge_requests/1

but then learnt u-boot-sam460ex is actually a mirror of your github
repo, and haven't got around to opening a new MR for your repo.

If you can pull the commits from that MR that'd be great, or I can
open a new MR, as you prefer.

With 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 :|

Re: [PATCH 0/7] testing and misc updates (docker, ansible, .git*, gitlab)

[BALATON Zoltan]

[-- Attachment #1: Type: text/plain, Size: 1798 bytes --]

On Wed, 1 Oct 2025, Daniel P. Berrangé wrote:
> On Wed, Oct 01, 2025 at 07:56:21PM +0200, BALATON Zoltan wrote:
>> On Wed, 1 Oct 2025, Alex Bennée wrote:
>>> My first set of patches for the development tree. Should be mostly
>>> self-explanatory. We still need to apply the upstream COPYING patch
>>> the u-boot-sam460ex code but we should decide if its worth mirroring
>>> or should we just treat the copy as fully "ours".
>>
>> Which COPYING patch do you refer to? I have the upstream because when I
>> submitted this I was told to do it this way instead of adding the u-boot
>> sources to the QEMU tree. It can't be merged with the official u-boot used
>> for e500 because it has sam460ex specific patches from the machine vendor
>> which only supports this u-boot version. There are some updates from the
>> vendor for real machine which I plan to add eventually but it's still based
>> on an older u-boot version. With mirroring I can update upstream and send
>> one patch to update the binary once it's mirrored, otherwise I'd need to
>> send patches for each update and rely on somebody to merge them.
>
> I opened this:
>
>  https://gitlab.com/qemu-project/u-boot-sam460ex/-/merge_requests/1
>
> but then learnt u-boot-sam460ex is actually a mirror of your github
> repo, and haven't got around to opening a new MR for your repo.
>
> If you can pull the commits from that MR that'd be great, or I can
> open a new MR, as you prefer.

I can get the patches from the gitlab pull request above and apply them 
the my github repo, no need to send a pull request there. I just don't get 
notified about what happens on gitlab so I have not seen this.

I'm not sure what Alex Bennée refers to as fixing up the mirror. Is it not 
mirroring now?

Regards,
BALATON Zoltan

> With regards,
> Daniel
>

Re: [PATCH 0/7] testing and misc updates (docker, ansible, .git*, gitlab)

[Alex Bennée]

BALATON Zoltan <balaton@eik.bme.hu> writes:

> On Wed, 1 Oct 2025, Daniel P. Berrangé wrote:
>> On Wed, Oct 01, 2025 at 07:56:21PM +0200, BALATON Zoltan wrote:
>>> On Wed, 1 Oct 2025, Alex Bennée wrote:
>>>> My first set of patches for the development tree. Should be mostly
>>>> self-explanatory. We still need to apply the upstream COPYING patch
>>>> the u-boot-sam460ex code but we should decide if its worth mirroring
>>>> or should we just treat the copy as fully "ours".
>>>
>>> Which COPYING patch do you refer to? I have the upstream because when I
>>> submitted this I was told to do it this way instead of adding the u-boot
>>> sources to the QEMU tree. It can't be merged with the official u-boot used
>>> for e500 because it has sam460ex specific patches from the machine vendor
>>> which only supports this u-boot version. There are some updates from the
>>> vendor for real machine which I plan to add eventually but it's still based
>>> on an older u-boot version. With mirroring I can update upstream and send
>>> one patch to update the binary once it's mirrored, otherwise I'd need to
>>> send patches for each update and rely on somebody to merge them.
>>
>> I opened this:
>>
>>  https://gitlab.com/qemu-project/u-boot-sam460ex/-/merge_requests/1
>>
>> but then learnt u-boot-sam460ex is actually a mirror of your github
>> repo, and haven't got around to opening a new MR for your repo.
>>
>> If you can pull the commits from that MR that'd be great, or I can
>> open a new MR, as you prefer.
>
> I can get the patches from the gitlab pull request above and apply
> them the my github repo, no need to send a pull request there. I just
> don't get notified about what happens on gitlab so I have not seen
> this.
>
> I'm not sure what Alex Bennée refers to as fixing up the mirror. Is it
> not mirroring now?

It was mirroring from github.com/qemu/u-boot-sam460ex - I thought I
might have to re-create it to get it to mirror from the right place but
it looks like you can tweak it in the config.
>
> Regards,
> BALATON Zoltan
>
>> With regards,
>> Daniel
>>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Re: [PATCH 0/7] testing and misc updates (docker, ansible, .git*, gitlab)

[Alex Bennée]

BALATON Zoltan <balaton@eik.bme.hu> writes:

> On Wed, 1 Oct 2025, Alex Bennée wrote:
>> My first set of patches for the development tree. Should be mostly
>> self-explanatory. We still need to apply the upstream COPYING patch
>> the u-boot-sam460ex code but we should decide if its worth mirroring
>> or should we just treat the copy as fully "ours".
>
> Which COPYING patch do you refer to? I have the upstream because when
> I submitted this I was told to do it this way instead of adding the
> u-boot sources to the QEMU tree. It can't be merged with the official
> u-boot used for e500 because it has sam460ex specific patches from the
> machine vendor which only supports this u-boot version. There are some
> updates from the vendor for real machine which I plan to add
> eventually but it's still based on an older u-boot version. With
> mirroring I can update upstream and send one patch to update the
> binary once it's mirrored, otherwise I'd need to send patches for each
> update and rely on somebody to merge them.

OK I'll fixup the mirror. I think I need to delete and re-create the
gitlab project repo now.

>
> Regards,
> BALATON Zoltan
>
>> Hopefully I'll have the new aarch64 runner online by Friday and ready
>> for the switchover.
>>
>> Hopefully I'll also be able to pick up Gustavo's reverse debug test
>> fixes by then as well.
>>
>> Alex.
>>
>> Alex Bennée (7):
>>  .gitpublish: use origin/master as default base
>>  .gitmodules: restore qemu-project mirror of u-boot
>>  .gitmodules: restore qemu-project mirror of u-boot-sam460ex
>>  tests/lcitool: drop 64 bit guests from i686 cross build
>>  tests/lcitool: bump custom runner packages to Ubuntu 24.04
>>  gitlab: move custom runners to Ubuntu 24.04
>>  scripts/ci: use recommended registration command
>>
>> .gitlab-ci.d/custom-runners.yml               |  6 ++--
>> ...4-aarch32.yml => ubuntu-24.04-aarch32.yml} |  8 ++---
>> ...4-aarch64.yml => ubuntu-24.04-aarch64.yml} | 32 +++++++++----------
>> ...22.04-s390x.yml => ubuntu-24.04-s390x.yml} | 28 ++++++++--------
>> .gitmodules                                   |  6 ++--
>> .gitpublish                                   | 16 +++++-----
>> scripts/ci/setup/gitlab-runner.yml            | 12 ++-----
>> scripts/ci/setup/ubuntu/build-environment.yml | 12 +++----
>> ...-aarch64.yaml => ubuntu-2404-aarch64.yaml} |  4 ++-
>> ...2204-s390x.yaml => ubuntu-2404-s390x.yaml} |  4 ++-
>> scripts/ci/setup/vars.yml.template            |  5 +--
>> .../dockerfiles/debian-i686-cross.docker      |  2 +-
>> tests/lcitool/refresh                         |  6 ++--
>> 13 files changed, 69 insertions(+), 72 deletions(-)
>> rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch32.yml => ubuntu-24.04-aarch32.yml} (78%)
>> rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-aarch64.yml => ubuntu-24.04-aarch64.yml} (89%)
>> rename .gitlab-ci.d/custom-runners/{ubuntu-22.04-s390x.yml => ubuntu-24.04-s390x.yml} (88%)
>> rename scripts/ci/setup/ubuntu/{ubuntu-2204-aarch64.yaml => ubuntu-2404-aarch64.yaml} (96%)
>> rename scripts/ci/setup/ubuntu/{ubuntu-2204-s390x.yaml => ubuntu-2404-s390x.yaml} (96%)
>>
>>

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro