[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] automation: Switch ppc64le tests to PowerNV machine type
commit 2ed144aff13c7f961de14e5c23fe822062a40692 Author: Shawn Anastasio <sanastasio@xxxxxxxxxxxxxxxxxxxxx> AuthorDate: Thu Sep 7 14:40:47 2023 -0500 Commit: Stefano Stabellini <stefano.stabellini@xxxxxxx> CommitDate: Thu Sep 7 17:37:34 2023 -0700 automation: Switch ppc64le tests to PowerNV machine type Run ppc64le tests with the PowerNV machine type (bare metal) instead of the paravirtualized pseries machine. This requires a more modern version of QEMU than is present in debian bullseye's repository, so update the dockerfile to build QEMU from source. Support for booting on pseries was broken by 74b725a64d80 ('xen/ppc: Implement initial Radix MMU support') which resulted in CI failures. In preparation for removing pseries support entirely, switch the CI infrastructure to the PowerNV machine type. Signed-off-by: Shawn Anastasio <sanastasio@xxxxxxxxxxxxxxxxxxxxx> Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx> --- .../build/debian/bullseye-ppc64le.dockerfile | 5 +-- automation/gitlab-ci/build.yaml | 14 ++++++++ automation/gitlab-ci/test.yaml | 5 +-- automation/scripts/qemu-smoke-ppc64le.sh | 3 +- .../qemu-system-ppc64/8.1.0-ppc64.dockerfile | 37 ++++++++++++++++++++++ 5 files changed, 59 insertions(+), 5 deletions(-) diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automation/build/debian/bullseye-ppc64le.dockerfile index 8fad26e903..4de8458445 100644 --- a/automation/build/debian/bullseye-ppc64le.dockerfile +++ b/automation/build/debian/bullseye-ppc64le.dockerfile @@ -22,8 +22,9 @@ RUN apt-get update && \ gcc-powerpc64le-linux-gnu \ make \ python3-minimal \ - # for test phase - qemu-system-ppc \ + # QEMU runtime dependencies for test phase + libglib2.0-0 \ + libpixman-1-0 \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index b633facff4..1619e9a558 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -306,6 +306,20 @@ qemu-system-aarch64-6.0.0-arm32-export: tags: - arm64 +# ppc64 test artifacts + +qemu-system-ppc64-8.1.0-ppc64-export: + extends: .test-jobs-artifact-common + image: registry.gitlab.com/xen-project/xen/tests-artifacts/qemu-system-ppc64:8.1.0-ppc64 + script: + - mkdir binaries && cp /qemu-system-ppc64 /skiboot.lid binaries/ + artifacts: + paths: + - binaries/qemu-system-ppc64 + - binaries/skiboot.lid + tags: + - x86_64 + # x86_64 test artifacts alpine-3.18-rootfs-export: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9aa8deabea..4b836bf047 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -454,9 +454,10 @@ qemu-smoke-riscv64-gcc: needs: - archlinux-current-gcc-riscv64-debug -qemu-smoke-ppc64le-pseries-gcc: +qemu-smoke-ppc64le-powernv9-gcc: extends: .qemu-ppc64le script: - - ./automation/scripts/qemu-smoke-ppc64le.sh pseries-5.2 2>&1 | tee ${LOGFILE} + - ./automation/scripts/qemu-smoke-ppc64le.sh powernv9 2>&1 | tee ${LOGFILE} needs: + - qemu-system-ppc64-8.1.0-ppc64-export - debian-bullseye-gcc-ppc64le-debug diff --git a/automation/scripts/qemu-smoke-ppc64le.sh b/automation/scripts/qemu-smoke-ppc64le.sh index eb55221221..2adbdac87e 100755 --- a/automation/scripts/qemu-smoke-ppc64le.sh +++ b/automation/scripts/qemu-smoke-ppc64le.sh @@ -12,7 +12,8 @@ set +e touch smoke.serial timeout -k 1 20 \ -qemu-system-ppc64 \ +binaries/qemu-system-ppc64 \ + -bios binaries/skiboot.lid \ -M $machine \ -m 2g \ -smp 1 \ diff --git a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile new file mode 100644 index 0000000000..7376ca46ff --- /dev/null +++ b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile @@ -0,0 +1,37 @@ +FROM debian:bullseye-slim +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx" + +ENV DEBIAN_FRONTEND=noninteractive +ENV QEMU_VERSION=8.1.0 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + curl \ + python3 \ + python3-pip \ + python3-elementpath \ + ninja-build \ + pkg-config \ + libglib2.0-dev \ + libpixman-1-dev \ + && \ + \ + curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \ + tar xvJf qemu-"$QEMU_VERSION".tar.xz && \ + cd qemu-"$QEMU_VERSION" && \ + ./configure --target-list=ppc64-softmmu && \ + make -j$(nproc) && \ + cp ./build/qemu-system-ppc64 / && \ + cp ./build/qemu-bundle/usr/local/share/qemu/skiboot.lid / && \ + cd /build && \ + rm -rf qemu-"$QEMU_VERSION"* && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* -- generated by git-patchbot for /home/xen/git/xen.git#master
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |