[xen stable-4.17] automation: Switch arm32 cross builds to run on arm64

[patchbot@xxxxxxx]

commit e3b23da4a10fafdabce22e2eba225d9404fc646f
Author:     Michal Orzel <michal.orzel@xxxxxxx>
AuthorDate: Tue Feb 14 16:38:38 2023 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Tue Apr 11 19:40:08 2023 +0100

    automation: Switch arm32 cross builds to run on arm64
    
    Due to the limited x86 CI resources slowing down the whole pipeline,
    switch the arm32 cross builds to be executed on arm64 which is much more
    capable. For that, rename the existing debian container dockerfile
    from unstable-arm32-gcc to unstable-arm64v8-arm32-gcc and use
    arm64v8/debian:unstable as an image. Note, that we cannot use the same
    container name as we have to keep the backwards compatibility.
    Take the opportunity to remove extra empty line at the end of a file.
    
    Modify the tag of .arm32-cross-build-tmpl to arm64 and update the build
    jobs accordingly.
    
    Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
    Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>
    (cherry picked from commit a35fccc8df93de7154dba87db6e7bcf391e9d51c)
---
 .../build/debian/unstable-arm32-gcc.dockerfile     | 24 ----------------------
 .../debian/unstable-arm64v8-arm32-gcc.dockerfile   | 23 +++++++++++++++++++++
 automation/gitlab-ci/build.yaml                    | 10 ++++-----
 3 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/automation/build/debian/unstable-arm32-gcc.dockerfile 
b/automation/build/debian/unstable-arm32-gcc.dockerfile
deleted file mode 100644
index b41a57f197..0000000000
--- a/automation/build/debian/unstable-arm32-gcc.dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM debian:unstable
-LABEL maintainer.name="The Xen Project" \
-      maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV USER root
-ENV CROSS_COMPILE /usr/bin/arm-linux-gnueabihf-
-
-RUN mkdir /build
-WORKDIR /build
-
-# build depends
-RUN apt-get update && \
-    apt-get --quiet --yes install \
-        build-essential \
-        flex \
-        bison \
-        git \
-        gcc-arm-linux-gnueabihf \
-        && \
-        apt-get autoremove -y && \
-        apt-get clean && \
-        rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
-
diff --git a/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile 
b/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile
new file mode 100644
index 0000000000..11860425a6
--- /dev/null
+++ b/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile
@@ -0,0 +1,23 @@
+FROM arm64v8/debian:unstable
+LABEL maintainer.name="The Xen Project" \
+      maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx"
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV USER root
+ENV CROSS_COMPILE /usr/bin/arm-linux-gnueabihf-
+
+RUN mkdir /build
+WORKDIR /build
+
+# build depends
+RUN apt-get update && \
+    apt-get --quiet --yes install \
+        build-essential \
+        flex \
+        bison \
+        git \
+        gcc-arm-linux-gnueabihf \
+        && \
+        apt-get autoremove -y && \
+        apt-get clean && \
+        rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/*
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index bed161b471..b4caf159f9 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -123,7 +123,7 @@
   variables:
     XEN_TARGET_ARCH: arm32
   tags:
-    - x86_64
+    - arm64
 
 .arm32-cross-build:
   extends: .arm32-cross-build-tmpl
@@ -505,23 +505,23 @@ alpine-3.12-clang-debug:
 debian-unstable-gcc-arm32:
   extends: .gcc-arm32-cross-build
   variables:
-    CONTAINER: debian:unstable-arm32-gcc
+    CONTAINER: debian:unstable-arm64v8-arm32-gcc
 
 debian-unstable-gcc-arm32-debug:
   extends: .gcc-arm32-cross-build-debug
   variables:
-    CONTAINER: debian:unstable-arm32-gcc
+    CONTAINER: debian:unstable-arm64v8-arm32-gcc
 
 debian-unstable-gcc-arm32-randconfig:
   extends: .gcc-arm32-cross-build
   variables:
-    CONTAINER: debian:unstable-arm32-gcc
+    CONTAINER: debian:unstable-arm64v8-arm32-gcc
     RANDCONFIG: y
 
 debian-unstable-gcc-arm32-debug-randconfig:
   extends: .gcc-arm32-cross-build-debug
   variables:
-    CONTAINER: debian:unstable-arm32-gcc
+    CONTAINER: debian:unstable-arm64v8-arm32-gcc
     RANDCONFIG: y
 
 # Arm builds
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.17