From nobody Sun May 5 18:57:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1635212543; cv=none; d=zohomail.com; s=zohoarc; b=IcdGtjuzQXHSKpHVd2KlK9VVLM8H64r4RwMVHvOAu76IcQJXQ/4B/3eslyg1141okNRDEW1M8tIDMaE2jg+EEOcPqp9f08lgKP+n2/ogA8RLax1eY24jsIaFBUtnm7mQropUBT6b69962pNU1rlTablfWQn+C3rq8j1mjAN2CuQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635212543; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=JFbVhpVExcSf4MHUyHxS2O88+5G2aKGLJ441Jn9a43A=; b=E/EJa44pMP5MW2wdhnGMhp60iPpngTWpp2P2exeWBDrSLf4cwOHXB5jamnZ6NgaZQGgMZ3IFqBpO2sI4+yxOk8CsCerqlb8Xn7p4iSWMz5fqSjJFVce2oH/zawYlTSe2hQ6t4FVPc9BT0T+kFqJMWzREHd14Cdggg5HOuxnE8eM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 16352125431053.04526765120886; Mon, 25 Oct 2021 18:42:23 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.216153.375646 (Exim 4.92) (envelope-from ) id 1mfBTa-0001aC-GL; Tue, 26 Oct 2021 01:42:06 +0000 Received: by outflank-mailman (output) from mailman id 216153.375646; Tue, 26 Oct 2021 01:42:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfBTa-0001a5-Ct; Tue, 26 Oct 2021 01:42:06 +0000 Received: by outflank-mailman (input) for mailman id 216153; Tue, 26 Oct 2021 01:42:05 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfBTZ-0001Zx-Pf for xen-devel@lists.xenproject.org; Tue, 26 Oct 2021 01:42:05 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id cad276e7-ccbb-4459-9680-8141b1dc6f86; Tue, 26 Oct 2021 01:42:04 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id CBA6961057; Tue, 26 Oct 2021 01:42:03 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: cad276e7-ccbb-4459-9680-8141b1dc6f86 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635212524; bh=RUYwi15asB7wOfxAWOMyV7/IDOyTDsG6KU/TPjlIGvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s8XUPMicLG5r3scOqPlya7YGhzh58wM9xME60beOxQuz5u8dzv0C/z2OQjJV/Y/f0 S5StysfqBTPbylRz4V2XWGYIGzWSl20D+4mBDSjupR4Qk/qMKZrpTY3A0v80LgjgDu 6KRSjQnWJEfv8nfDW1JmlCTurEVNuSlxtlL/yTLJMfZGc8cIVeymP+A2l92DFA4dDz +kx0YrYMldXsQV+M5VXU57rt/Mx7emBxySVPzppaGHLKhQpRLQ+SOtbkkCwl93845M O1bJFZvuQue6nJq5D7xCP/ELuipXpKJLwfWqM02FUh8UU6irFTIjiz2gA0PF5mmHE5 tdjL6wa8kf/dw== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, iwj@xenproject.org, cardoe@cardoe.com, wl@xen.org, andrew.cooper3@citrix.com, anthony.perard@citrix.com, Stefano Stabellini Subject: [PATCH v2 1/3] automation: add x86_64 alpine 3.12 test-artifact Date: Mon, 25 Oct 2021 18:41:58 -0700 Message-Id: <20211026014200.32102-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1635212545394100003 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini It is the same as the existing ARM64 alpine 3.12 test-artifact. It is used to export an Alpine rootfs for Dom0 used for testing. Also add the exporting job to build.yaml so that the binaries can be used during gitlab-ci runs. Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- Changes in 2: - remove gettext --- automation/gitlab-ci/build.yaml | 13 ++++ .../tests-artifacts/alpine/3.12.dockerfile | 66 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 automation/tests-artifacts/alpine/3.12.dockerfile diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index d177da1710..76b73beead 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -596,3 +596,16 @@ qemu-system-aarch64-5.2.0-arm64-export: tags: - arm64 =20 + +# x86_64 test artifacts + +alpine-3.12-rootfs-export: + stage: build + image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.12 + script: + - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz + artifacts: + paths: + - binaries/initrd.tar.gz + tags: + - x86_64 diff --git a/automation/tests-artifacts/alpine/3.12.dockerfile b/automation= /tests-artifacts/alpine/3.12.dockerfile new file mode 100644 index 0000000000..b3909996b4 --- /dev/null +++ b/automation/tests-artifacts/alpine/3.12.dockerfile @@ -0,0 +1,66 @@ +FROM alpine:3.12 +LABEL maintainer.name=3D"The Xen Project" \ + maintainer.email=3D"xen-devel@lists.xenproject.org" + +ENV USER root + +RUN mkdir /build +WORKDIR /build + +RUN \ + # apk + apk update && \ + \ + # xen runtime deps + apk add musl && \ + apk add openrc && \ + apk add busybox && \ + apk add sudo && \ + apk add dbus && \ + apk add bash && \ + apk add python2 && \ + apk add zlib && \ + apk add ncurses && \ + apk add texinfo && \ + apk add yajl && \ + apk add libaio && \ + apk add xz-dev && \ + apk add util-linux && \ + apk add argp-standalone && \ + apk add libfdt && \ + apk add glib && \ + apk add pixman && \ + apk add curl && \ + apk add udev && \ + \ + # Xen + cd / && \ + # Minimal ramdisk environment in case of cpio output + rc-update add udev && \ + rc-update add udev-trigger && \ + rc-update add udev-settle && \ + rc-update add networking sysinit && \ + rc-update add loopback sysinit && \ + rc-update add bootmisc boot && \ + rc-update add devfs sysinit && \ + rc-update add dmesg sysinit && \ + rc-update add hostname boot && \ + rc-update add hwclock boot && \ + rc-update add hwdrivers sysinit && \ + rc-update add killprocs shutdown && \ + rc-update add modloop sysinit && \ + rc-update add modules boot && \ + rc-update add mount-ro shutdown && \ + rc-update add savecache shutdown && \ + rc-update add sysctl boot && \ + rc-update add local default && \ + cp -a /sbin/init /init && \ + echo "ttyS0" >> /etc/securetty && \ + echo "hvc0" >> /etc/securetty && \ + echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab = && \ + echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab &&= \ + passwd -d "root" root && \ + \ + # Create rootfs + cd / && \ + tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr = var --=20 2.17.1 From nobody Sun May 5 18:57:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1635212546; cv=none; d=zohomail.com; s=zohoarc; b=HJR6lxXH918pWpxPuqPmBFFzbjzsYq3TMmQqSE8gkUMF92m0KwIlZBeTit71Sa4o+FlWf7gAe15QaUGU2MxWG+SAAaXEbirWNpw2g818p9veYRfmLUIz9wxp2MloA/Y25pYtUj0kM9k+Fl3y1pNZNpPoKes+fq2NEFZt8lnp3hk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635212546; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=Ju58vHh9vOAqtbARdTXotbI+DxSxQLjW0jZukxUFDKc=; b=Fg85Iglahm4sCN3hT9P5wsgGQoN1z30ofxKPSFnuHiG+G/GgFMVUQ0IivQB77Yfl5woYXpwDVLsUkhStDn0pz5Rmlbk/YxF7YGZjs/KTy0X2hecYuvA7mxzUMaHlagPim9Rjuz2WWzLsib5HsLl5VnttEkjqaUKJ6NOOmxN0MZs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1635212546032640.6810702021153; Mon, 25 Oct 2021 18:42:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.216155.375668 (Exim 4.92) (envelope-from ) id 1mfBTg-0002A0-1Q; Tue, 26 Oct 2021 01:42:12 +0000 Received: by outflank-mailman (output) from mailman id 216155.375668; Tue, 26 Oct 2021 01:42:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfBTf-00029o-Tq; Tue, 26 Oct 2021 01:42:11 +0000 Received: by outflank-mailman (input) for mailman id 216155; Tue, 26 Oct 2021 01:42:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfBTe-0001Zx-Lq for xen-devel@lists.xenproject.org; Tue, 26 Oct 2021 01:42:10 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id c2a19dd3-c513-4b1b-80f8-6e8668b534a1; Tue, 26 Oct 2021 01:42:05 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 4328160041; Tue, 26 Oct 2021 01:42:04 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: c2a19dd3-c513-4b1b-80f8-6e8668b534a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635212524; bh=mvnhBoB/kIkG732gUvVDI6GT3xtvGIUsrPyx8vSP5Qo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D2hpE7ysQr7wrinGPFTuUj3vDE5AR5QMOmm/XRUx+0dmnDvWl2kpGqnWc+neNQIhg NDWqqD4cqh51EeCe7I+rXCPzbC2Iz8QfM7NjGjgzI6Aa9kIOumc8r5iZKWSy1e2M1Q T+UOHPADg24UOK5C7qAYepm9yunDVBv4E+4Ks6bOeRx2gaKUxb1vOohS0d1XUejnTb yPKxj/cZtF7FJ80UBKPTEjyuEhRjK2Zuresu2Q+shkz5zt9aOhJkAwIXijHK53H00x bklZ4lqZ2RyzNX+QuqBmkLO3dFGruQHjMsZQlcvbZ9JYl22vgZlMjHjS+Xh8iuvuS6 xg9n9z3PWrQVg== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, iwj@xenproject.org, cardoe@cardoe.com, wl@xen.org, andrew.cooper3@citrix.com, anthony.perard@citrix.com, Stefano Stabellini Subject: [PATCH v2 2/3] automation: Linux 5.10.74 test-artifact Date: Mon, 25 Oct 2021 18:41:59 -0700 Message-Id: <20211026014200.32102-2-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1635212547393100005 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini Build a 5.10 kernel to be used as Dom0 and DomU kernel for testing. This is almost the same as the existing ARM64 recipe for Linux 5.9, the only differences are: - upgrade to latest 5.10.x stable - force Xen modules to built-in (on ARM it was already done by defconfig) Also add the exporting job to build.yaml so that the binary can be used during gitlab-ci runs. Signed-off-by: Stefano Stabellini Reviewed-by: Anthony PERARD --- Note that make tinyconfig cannot be used because it doesn't boot on QEMU Changes in 2: - use two RUNs - remove apt-get cleanup earlier --- automation/gitlab-ci/build.yaml | 11 ++++++ .../tests-artifacts/kernel/5.10.74.dockerfile | 38 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 automation/tests-artifacts/kernel/5.10.74.dockerfile diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index 76b73beead..0034c50950 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -609,3 +609,14 @@ alpine-3.12-rootfs-export: - binaries/initrd.tar.gz tags: - x86_64 + +kernel-5.10.74-export: + stage: build + image: registry.gitlab.com/xen-project/xen/tests-artifacts/kernel:5.10.74 + script: + - mkdir binaries && cp /bzImage binaries/bzImage + artifacts: + paths: + - binaries/bzImage + tags: + - x86_64 diff --git a/automation/tests-artifacts/kernel/5.10.74.dockerfile b/automat= ion/tests-artifacts/kernel/5.10.74.dockerfile new file mode 100644 index 0000000000..112e27fe45 --- /dev/null +++ b/automation/tests-artifacts/kernel/5.10.74.dockerfile @@ -0,0 +1,38 @@ +FROM debian:unstable +LABEL maintainer.name=3D"The Xen Project" \ + maintainer.email=3D"xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=3Dnoninteractive +ENV LINUX_VERSION=3D5.10.74 +ENV USER root + +RUN mkdir /build +WORKDIR /build + +# build depends +RUN apt-get update && \ + apt-get --quiet --yes install \ + build-essential \ + libssl-dev \ + bc \ + curl \ + flex \ + bison \ + libelf-dev \ + && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* + +# Build the kernel +RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-"$LINUX= _VERSION".tar.xz && \ + tar xvJf linux-"$LINUX_VERSION".tar.xz && \ + cd linux-"$LINUX_VERSION" && \ + make defconfig && \ + make xen.config && \ + cp .config .config.orig && \ + cat .config.orig | grep XEN | grep =3Dm |sed 's/=3Dm/=3Dy/g' >> .confi= g && \ + make -j$(nproc) bzImage && \ + cp arch/x86/boot/bzImage / && \ + cd /build && \ + rm -rf linux-"$LINUX_VERSION"* --=20 2.17.1 From nobody Sun May 5 18:57:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1635212542; cv=none; d=zohomail.com; s=zohoarc; b=AJ43KHuVtY5L4vnylFQT3mDfvjp79/kB6QX4ka5vteEdTJv7VePayDfDPQjJztKaZxafmDJiMT4Wk0uRLluxg/kS6cFfZ158JWareQY9dNsSGPed9U8V0+xZtBsurJgzzF5BhteLg86vH91oH0T7ZPx1km9ERjVbllCuov2WQjk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635212542; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=rLirFKDU4X8awgZ6h2p3HsFoxBtnm+tggI0J7shHM4I=; b=ViAvUw3Jwo6DQnK7UI6MjZTeN+olPAQkZ1gJNzET73i0Hp0PNBI51uzUxYB9pNxaZdoF5f1v+GC6VxL/ClQ5ZxwuHnog9TZR0kXK0XZrBF6ybYpdyZXr0BZMJ3CQjhlzT+FBEQ3Y1hHvd+xRKIeeNBD4NN4DtHkqnGgg1Ii8SH0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1635212542426320.33496850246695; Mon, 25 Oct 2021 18:42:22 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.216154.375656 (Exim 4.92) (envelope-from ) id 1mfBTb-0001qC-OV; Tue, 26 Oct 2021 01:42:07 +0000 Received: by outflank-mailman (output) from mailman id 216154.375656; Tue, 26 Oct 2021 01:42:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfBTb-0001q5-Ky; Tue, 26 Oct 2021 01:42:07 +0000 Received: by outflank-mailman (input) for mailman id 216154; Tue, 26 Oct 2021 01:42:06 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mfBTa-0001bn-NF for xen-devel@lists.xenproject.org; Tue, 26 Oct 2021 01:42:06 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id ec74f456-35fd-11ec-8420-12813bfff9fa; Tue, 26 Oct 2021 01:42:05 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id A5DAB6023B; Tue, 26 Oct 2021 01:42:04 +0000 (UTC) X-Outflank-Mailman: Message body and most headers restored to incoming version 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: ec74f456-35fd-11ec-8420-12813bfff9fa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635212524; bh=Kx4e9+ekLwMR2Kc2Ru1z1j3d1ZvwiDUM6uDgREU3a9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tQO9I9XDiDnGpNsBda+yTd3vkdLZqNPvfNnSgwqna36qaZ+f+LKg4DQLLFanKyrcD ssd0OHY8ffpNKINQxU9ygLzkLjF0xFIqsmzGoUwdT2jT32wFjegqkA0ebUthPRadXt hISZSZQDCN40xfQicVvw5GxhN5JTalmX/igyqS8gqU6faU5Rp/r2Ie/6L3JlsEmwV9 vZozALXNktdKttsKTFwq8MRLF+y3/KN7tZwdpT/ANyAOFeXKte+1ZX+0fQOGCFChtx G6tEvYMA5NuxeCb/p7VI/wznILWRaDzl85nKpa01h4FbEIY00aBRJWMeyWIrWnWIsz zH/n/zaD1su0g== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, iwj@xenproject.org, cardoe@cardoe.com, wl@xen.org, andrew.cooper3@citrix.com, anthony.perard@citrix.com, Stefano Stabellini Subject: [PATCH v2 3/3] automation: add a QEMU based x86_64 Dom0/DomU test Date: Mon, 25 Oct 2021 18:42:00 -0700 Message-Id: <20211026014200.32102-3-sstabellini@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1635212543445100001 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini Introduce a test based on QEMU to run Xen, Dom0 and start a DomU. This is similar to the existing qemu-alpine-arm64.sh script and test. The only differences are: - use Debian's qemu-system-x86_64 (on ARM we build our own) - use ipxe instead of u-boot and ImageBuilder Signed-off-by: Stefano Stabellini --- apt-get is not entirely removed yet as we need cpio and busybox-static. I am in favor of keeping them as apt-get packages because they are not needed in the build container. At the same time I see that being small they wouldn't increase the build container by much. Changes in v2: - remove curl - add comments - add set -x - use debian:stretch and remove qemu --- automation/gitlab-ci/test.yaml | 24 ++++++ automation/scripts/qemu-alpine-x86_64.sh | 95 ++++++++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100755 automation/scripts/qemu-alpine-x86_64.sh diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 91a10febbf..43d248a604 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -47,6 +47,30 @@ qemu-alpine-arm64-gcc: - /^coverity-tested\/.*/ - /^stable-.*/ =20 +qemu-alpine-x86_64-gcc: + stage: test + image: registry.gitlab.com/xen-project/xen/${CONTAINER} + variables: + CONTAINER: debian:stretch + script: + - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee qemu-smoke-arm= 64.log + dependencies: + - alpine-3.12-gcc + - alpine-3.12-rootfs-export + - kernel-5.10.74-export + artifacts: + paths: + - smoke.serial + - '*.log' + when: always + tags: + - x86_64 + except: + - master + - smoke + - /^coverity-tested\/.*/ + - /^stable-.*/ + qemu-smoke-arm64-gcc: stage: test image: registry.gitlab.com/xen-project/xen/${CONTAINER} diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/= qemu-alpine-x86_64.sh new file mode 100755 index 0000000000..2e9625109c --- /dev/null +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -0,0 +1,95 @@ +#!/bin/bash + +set -ex + +apt-get -qy update +apt-get -qy install --no-install-recommends cpio \ + busybox-static + +# DomU Busybox +cd binaries +mkdir -p initrd +mkdir -p initrd/bin +mkdir -p initrd/sbin +mkdir -p initrd/etc +mkdir -p initrd/dev +mkdir -p initrd/proc +mkdir -p initrd/sys +mkdir -p initrd/lib +mkdir -p initrd/var +mkdir -p initrd/mnt +cp /bin/busybox initrd/bin/busybox +initrd/bin/busybox --install initrd/bin +echo "#!/bin/sh + +mount -t proc proc /proc +mount -t sysfs sysfs /sys +mount -t devtmpfs devtmpfs /dev +/bin/sh" > initrd/init +chmod +x initrd/init +# DomU rootfs +cd initrd +find . | cpio --create --format=3D'newc' | gzip > ../initrd.cpio.gz +cd .. + +# initrd.tar.gz is Dom0 rootfs +mkdir -p rootfs +cd rootfs +tar xvzf ../initrd.tar.gz +mkdir proc +mkdir run +mkdir srv +mkdir sys +rm var/run +cp -ar ../dist/install/* . +mv ../initrd.cpio.gz ./root +cp ../bzImage ./root +echo "name=3D\"test\" +memory=3D512 +vcpus=3D1 +kernel=3D\"/root/bzImage\" +ramdisk=3D\"/root/initrd.cpio.gz\" +extra=3D\"console=3Dhvc0 root=3D/dev/ram0 rdinit=3D/bin/sh\" +" > root/test.cfg +echo "#!/bin/bash + +set -x + +export LD_LIBRARY_PATH=3D/usr/local/lib +bash /etc/init.d/xencommons start + +xl list + +xl create -c /root/test.cfg + +" > etc/local.d/xen.start +chmod +x etc/local.d/xen.start +echo "rc_verbose=3Dyes" >> etc/rc.conf +# rebuild Dom0 rootfs +find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +cd ../.. + +cat >> binaries/pxelinux.0 << EOF +#!ipxe + +kernel xen console=3Dcom1 +module bzImage console=3Dhvc0 +module xen-rootfs.cpio.gz +boot +EOF + +# Run the test +rm -f smoke.serial +set +e +timeout -k 1 720 \ +qemu-system-x86_64 \ + -cpu qemu64,+svm \ + -m 2G -smp 2 \ + -monitor none -serial stdio \ + -nographic \ + -device virtio-net-pci,netdev=3Dn0 \ + -netdev user,id=3Dn0,tftp=3Dbinaries,bootfile=3D/pxelinux.0 |& tee smo= ke.serial + +set -e +(grep -q "Domain-0" smoke.serial && grep -q "BusyBox" smoke.serial) || exi= t 1 +exit 0 --=20 2.17.1