| Message ID | 20230214153842.15637-2-michal.orzel@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | automation: dom0less arm32 testing | expand |
On Tue, 14 Feb 2023, Michal Orzel wrote: > 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@amd.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > Changes in v2: > - new patch > > For convenience and own testing, I built and pushed the new container > to registry. Thanks! > --- > ...ockerfile => unstable-arm64v8-arm32-gcc.dockerfile} | 3 +-- > automation/gitlab-ci/build.yaml | 10 +++++----- > 2 files changed, 6 insertions(+), 7 deletions(-) > rename automation/build/debian/{unstable-arm32-gcc.dockerfile => unstable-arm64v8-arm32-gcc.dockerfile} (94%) > > diff --git a/automation/build/debian/unstable-arm32-gcc.dockerfile b/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile > similarity index 94% > rename from automation/build/debian/unstable-arm32-gcc.dockerfile > rename to automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile > index b41a57f19729..11860425a6a2 100644 > --- a/automation/build/debian/unstable-arm32-gcc.dockerfile > +++ b/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile > @@ -1,4 +1,4 @@ > -FROM debian:unstable > +FROM arm64v8/debian:unstable > LABEL maintainer.name="The Xen Project" \ > maintainer.email="xen-devel@lists.xenproject.org" > > @@ -21,4 +21,3 @@ RUN apt-get update && \ > 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 a053c5c7325d..f8e156e0a994 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 > @@ -542,26 +542,26 @@ 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 > HYPERVISOR_ONLY: y > > debian-unstable-gcc-arm32-debug: > extends: .gcc-arm32-cross-build-debug > variables: > - CONTAINER: debian:unstable-arm32-gcc > + CONTAINER: debian:unstable-arm64v8-arm32-gcc > HYPERVISOR_ONLY: y > > debian-unstable-gcc-arm32-randconfig: > extends: .gcc-arm32-cross-build > variables: > - CONTAINER: debian:unstable-arm32-gcc > + CONTAINER: debian:unstable-arm64v8-arm32-gcc > HYPERVISOR_ONLY: y > 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 > HYPERVISOR_ONLY: y > RANDCONFIG: y > > -- > 2.25.1 >
diff --git a/automation/build/debian/unstable-arm32-gcc.dockerfile b/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile similarity index 94% rename from automation/build/debian/unstable-arm32-gcc.dockerfile rename to automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile index b41a57f19729..11860425a6a2 100644 --- a/automation/build/debian/unstable-arm32-gcc.dockerfile +++ b/automation/build/debian/unstable-arm64v8-arm32-gcc.dockerfile @@ -1,4 +1,4 @@ -FROM debian:unstable +FROM arm64v8/debian:unstable LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" @@ -21,4 +21,3 @@ RUN apt-get update && \ 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 a053c5c7325d..f8e156e0a994 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 @@ -542,26 +542,26 @@ 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 HYPERVISOR_ONLY: y debian-unstable-gcc-arm32-debug: extends: .gcc-arm32-cross-build-debug variables: - CONTAINER: debian:unstable-arm32-gcc + CONTAINER: debian:unstable-arm64v8-arm32-gcc HYPERVISOR_ONLY: y debian-unstable-gcc-arm32-randconfig: extends: .gcc-arm32-cross-build variables: - CONTAINER: debian:unstable-arm32-gcc + CONTAINER: debian:unstable-arm64v8-arm32-gcc HYPERVISOR_ONLY: y 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 HYPERVISOR_ONLY: y RANDCONFIG: y
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@amd.com> --- Changes in v2: - new patch For convenience and own testing, I built and pushed the new container to registry. --- ...ockerfile => unstable-arm64v8-arm32-gcc.dockerfile} | 3 +-- automation/gitlab-ci/build.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) rename automation/build/debian/{unstable-arm32-gcc.dockerfile => unstable-arm64v8-arm32-gcc.dockerfile} (94%)