From patchwork Tue Sep 5 21:46:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Anastasio X-Patchwork-Id: 13375119 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 03D8ECA1016 for ; Tue, 5 Sep 2023 21:47:31 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.595839.929463 (Exim 4.92) (envelope-from ) id 1qddt2-000561-5j; Tue, 05 Sep 2023 21:47:04 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 595839.929463; Tue, 05 Sep 2023 21:47:04 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qddt2-00055u-28; Tue, 05 Sep 2023 21:47:04 +0000 Received: by outflank-mailman (input) for mailman id 595839; Tue, 05 Sep 2023 21:47:03 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qddt1-00055j-HD for xen-devel@lists.xenproject.org; Tue, 05 Sep 2023 21:47:03 +0000 Received: from raptorengineering.com (mail.raptorengineering.com [23.155.224.40]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bea37307-4c35-11ee-8783-cb3800f73035; Tue, 05 Sep 2023 23:47:01 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id BEAFF8285A0F; Tue, 5 Sep 2023 16:47:00 -0500 (CDT) Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id Y4O2C3U_i-oP; Tue, 5 Sep 2023 16:46:59 -0500 (CDT) Received: from localhost (localhost [127.0.0.1]) by mail.rptsys.com (Postfix) with ESMTP id B5CA08285BE0; Tue, 5 Sep 2023 16:46:59 -0500 (CDT) Received: from mail.rptsys.com ([127.0.0.1]) by localhost (vali.starlink.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 4HC6_Dc8Gkyq; Tue, 5 Sep 2023 16:46:59 -0500 (CDT) Received: from raptor-ewks-026.rptsys.com (5.edge.rptsys.com [23.155.224.38]) by mail.rptsys.com (Postfix) with ESMTPSA id 1423A8285BDA; Tue, 5 Sep 2023 16:46:59 -0500 (CDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bea37307-4c35-11ee-8783-cb3800f73035 DKIM-Filter: OpenDKIM Filter v2.10.3 mail.rptsys.com B5CA08285BE0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raptorengineering.com; s=B8E824E6-0BE2-11E6-931D-288C65937AAD; t=1693950419; bh=HPoBwSCbQLNGCbqSv6oxH+y3tTtdXTvzN64OUdvDgbU=; h=From:To:Date:Message-Id:MIME-Version; b=ZHsJVib6nUh8BY59zfvXiEuqFmtiKwGyH4IKX8iX81S1D6+fbEgkNgDvyIOUVWQDw g96gF/5b2/cGkfI5mSh6shpTqnNKPrBB2NdC7JGSIC+jZbfUeClexlCaByeryjTlrE mH39Su9AMnhatHn7ypgxmreuoDuLhjrTlUhpftrA= X-Virus-Scanned: amavisd-new at rptsys.com From: Shawn Anastasio To: xen-devel@lists.xenproject.org Cc: Timothy Pearson , Jan Beulich , Andrew Cooper , Shawn Anastasio , Doug Goldstein , Stefano Stabellini Subject: [PATCH 1/2] automation: Switch ppc64le tests to PowerNV machine type Date: Tue, 5 Sep 2023 16:46:49 -0500 Message-Id: <50693d0763b656bad9d799313c8f12e736bb68ef.1693949731.git.sanastasio@raptorengineering.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: References: MIME-Version: 1.0 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. Signed-off-by: Shawn Anastasio --- .../build/debian/bullseye-ppc64le.dockerfile | 37 ++++++++++++++++++- automation/gitlab-ci/test.yaml | 2 +- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automation/build/debian/bullseye-ppc64le.dockerfile index 8fad26e903..15827bbcf4 100644 --- a/automation/build/debian/bullseye-ppc64le.dockerfile +++ b/automation/build/debian/bullseye-ppc64le.dockerfile @@ -1,4 +1,36 @@ +FROM debian:bullseye-slim AS builder + +ENV DEBIAN_FRONTEND=noninteractive +ENV QEMU_TAG=stable-8.1 +ENV USER root + +# dependencies for qemu build +RUN apt-get update && \ + apt-get --quiet --yes install \ + git \ + build-essential \ + python3-minimal \ + python3-elementpath \ + python3-pip \ + ninja-build \ + libglib2.0-dev \ + libpixman-1-dev + +RUN mkdir /build +WORKDIR /build + +# QEMU build from git +RUN git clone --depth 1 --branch "${QEMU_TAG}" https://github.com/qemu/qemu && \ + mkdir qemu/build && \ + cd qemu/build && \ + ../configure --target-list=ppc64-softmmu && \ + ninja && \ + ninja install + FROM debian:bullseye-slim +COPY --from=builder /usr/local/bin/qemu-system-ppc64 /usr/local/bin/qemu-system-ppc64 +COPY --from=builder /usr/local/share/qemu/skiboot.lid /usr/local/share/qemu/skiboot.lid + LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" @@ -22,8 +54,9 @@ RUN apt-get update && \ gcc-powerpc64le-linux-gnu \ make \ python3-minimal \ - # for test phase - qemu-system-ppc \ + # QEMU runtime dependencies + libglib2.0-0 \ + libpixman-1-0 \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9aa8deabea..9b26ccd907 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -457,6 +457,6 @@ qemu-smoke-riscv64-gcc: qemu-smoke-ppc64le-pseries-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: - debian-bullseye-gcc-ppc64le-debug