qemu-system-ppc64/8.1.0-ppc64 was added because bullseye's Qemu didn't
understand the powernv9 machine.
However, bookworm's Qemu does, and this is preforable to maintaining a random
build of Qemu ourselves.
Add bookworm builds, and retain bullseye to keep our lower-bound toolchain
testing.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Anthony PERARD <anthony.perard@vates.tech>
CC: Juergen Gross <jgross@suse.com>
CC: Roger Pau Monné <roger.pau@citrix.com>
CC: Jan Beulich <JBeulich@suse.com>
CC: Stefano Stabellini <sstabellini@kernel.org>
CC: Julien Grall <julien@xen.org>
CC: Oleksii Kurochko <oleksii.kurochko@gmail.com>
CC: Shawn Anastasio <sanastasio@raptorengineering.com>
---
automation/gitlab-ci/build.yaml | 22 +++++++++--
automation/gitlab-ci/test.yaml | 3 +-
automation/scripts/qemu-smoke-ppc64le.sh | 4 +-
.../qemu-system-ppc64/8.1.0-ppc64.dockerfile | 38 -------------------
4 files changed, 21 insertions(+), 46 deletions(-)
delete mode 100644 automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index ff5c9055d1f0..d6da156a5c85 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -534,17 +534,17 @@ archlinux-current-gcc-riscv64-debug-randconfig:
<<: *riscv-fixed-randconfig
# Power cross-build
-debian-bullseye-gcc-ppc64le:
+debian-bookworm-gcc-ppc64le:
extends: .gcc-ppc64le-cross-build
variables:
- CONTAINER: debian:bullseye-ppc64le
+ CONTAINER: debian:bookworm-ppc64le
KBUILD_DEFCONFIG: ppc64_defconfig
HYPERVISOR_ONLY: y
-debian-bullseye-gcc-ppc64le-debug:
+debian-bookworm-gcc-ppc64le-debug:
extends: .gcc-ppc64le-cross-build-debug
variables:
- CONTAINER: debian:bullseye-ppc64le
+ CONTAINER: debian:bookworm-ppc64le
KBUILD_DEFCONFIG: ppc64_defconfig
HYPERVISOR_ONLY: y
@@ -817,3 +817,17 @@ opensuse-tumbleweed-gcc-debug:
variables:
CONTAINER: suse:opensuse-tumbleweed
allow_failure: true
+
+debian-bullseye-gcc-ppc64le:
+ extends: .gcc-ppc64le-cross-build
+ variables:
+ CONTAINER: debian:bullseye-ppc64le
+ KBUILD_DEFCONFIG: ppc64_defconfig
+ HYPERVISOR_ONLY: y
+
+debian-bullseye-gcc-ppc64le-debug:
+ extends: .gcc-ppc64le-cross-build-debug
+ variables:
+ CONTAINER: debian:bullseye-ppc64le
+ KBUILD_DEFCONFIG: ppc64_defconfig
+ HYPERVISOR_ONLY: y
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 898d2adc8c5b..479479f23f65 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -447,5 +447,4 @@ qemu-smoke-ppc64le-powernv9-gcc:
script:
- ./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
+ - debian-bookworm-gcc-ppc64le-debug
diff --git a/automation/scripts/qemu-smoke-ppc64le.sh b/automation/scripts/qemu-smoke-ppc64le.sh
index 701d81107d18..9088881b731b 100755
--- a/automation/scripts/qemu-smoke-ppc64le.sh
+++ b/automation/scripts/qemu-smoke-ppc64le.sh
@@ -12,8 +12,8 @@ rm -f ${serial_log}
set +e
timeout -k 1 20 \
-binaries/qemu-system-ppc64 \
- -bios binaries/skiboot.lid \
+qemu-system-ppc64 \
+ -bios 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
deleted file mode 100644
index e28d68649239..000000000000
--- a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile
+++ /dev/null
@@ -1,38 +0,0 @@
-# syntax=docker/dockerfile:1
-FROM --platform=linux/amd64 debian:bullseye-slim
-LABEL maintainer.name="The Xen Project" \
- maintainer.email="xen-devel@lists.xenproject.org"
-
-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/*
--
2.39.2
© 2016 - 2024 Red Hat, Inc.