From nobody Tue May 14 00:55:45 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=1676498995; cv=none; d=zohomail.com; s=zohoarc; b=Ys+HxFzyj6P8nmUAE5CJqTyjIHmYo/KuraXxGRRDjqJdBjTaXiPgJe19VPMyDIfR2AtRFvYQPRJw/4Monr+8/M18PiEglMMjHQsJV52p6xLZPBA0awoRtTTz/5DmeqkHTCzft6QQJ1iPhCZUgLzjd+E7rn67lWi3Yw42rBRgJy8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676498995; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tnl9DPLr6F91rUumqI3Vqu+LTez7tP6P1GRDknEXGDw=; b=hXWZvXNluJTn71MWC7AFsTVjFAoFr8/+P8npHLlTQl2lOGjbGaMNc81prxdwAx+SuB3aHz4cvthMb/lsrDLe4eEGyyo6upnE/C0lRTBjhsImlHb8SZ24At6FzGymH8lKliZADQbJDbjzHGJqXu1v520lXOC+sSSvXqJ7kTDsswM= 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 1676498995375896.6620415058876; Wed, 15 Feb 2023 14:09:55 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.496246.766887 (Exim 4.92) (envelope-from ) id 1pSPy1-0005jo-Vs; Wed, 15 Feb 2023 22:09:33 +0000 Received: by outflank-mailman (output) from mailman id 496246.766887; Wed, 15 Feb 2023 22:09:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pSPy1-0005jh-QS; Wed, 15 Feb 2023 22:09:33 +0000 Received: by outflank-mailman (input) for mailman id 496246; Wed, 15 Feb 2023 22:09:32 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pSPxz-0005R2-V0 for xen-devel@lists.xenproject.org; Wed, 15 Feb 2023 22:09:32 +0000 Received: from ams.source.kernel.org (ams.source.kernel.org [2604:1380:4601:e00::1]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6b015b85-ad7d-11ed-93b5-47a8fe42b414; Wed, 15 Feb 2023 23:09:30 +0100 (CET) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 66D70B82374; Wed, 15 Feb 2023 22:09:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5793FC433D2; Wed, 15 Feb 2023 22:09:27 +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: 6b015b85-ad7d-11ed-93b5-47a8fe42b414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676498968; bh=Tso1s+NNc0babg5gBaw2ZRssYgQb1dk1kR0QDs857oM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t7qWg+q6/llTe3MDd8dpsqgf2FSrMMv8Vy7IMJbUj4UO38xjlKFobYN2+bej+yfxT Ms1gfKCMJ0DCpI5hXDVXMqRRu74TVJhsr9y7OA/h+j6BLu6paBXkOOJTmDbypIVKTR cn1ObUNF9k8HX2MFhD04c9tsK+6ii5AeYngxcllvCPQDcCVVwP+metXoR286yzN5Mc wrbEJW01gFP0fKbevbGqryc6OUDjTjdhHjkRHCcTnkEOeVkJPUv7HIr06FbDKWm1hC X3YQ1aBz200X2EIe9bCkdoYDQvT7aAWbvGQOPjbmBN8eXqDIbZsrUpGIZlpbytXVcW 9n36s3uyDlpNQ== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, cardoe@cardoe.com, michal.orzel@amd.com, Stefano Stabellini Subject: [PATCH v2 1/3] automation: move yocto jobs to build stage Date: Wed, 15 Feb 2023 14:09:23 -0800 Message-Id: <20230215220925.2313528-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1676498997081100001 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini We are going to use artifacts produced by the Yocto builds in test jobs. Signed-off-by: Stefano Stabellini Reviewed-by: Michal Orzel --- automation/gitlab-ci/build.yaml | 51 +++++++++++++++++++++++++++++++++ automation/gitlab-ci/test.yaml | 45 ----------------------------- 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index a053c5c732..f62cf21f45 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -199,6 +199,41 @@ variables: <<: *gcc =20 +.yocto-test: + stage: build + image: registry.gitlab.com/xen-project/xen/${CONTAINER} + except: + - master + - smoke + - /^coverity-tested\/.*/ + - /^stable-.*/ + script: + - ./automation/build/yocto/build-yocto.sh -v --log-dir=3D./logs --xen-= dir=3D`pwd` ${YOCTO_BOARD} + variables: + YOCTO_VERSION: kirkstone + CONTAINER: yocto:${YOCTO_VERSION}-${YOCTO_BOARD}-${YOCTO_HOST} + artifacts: + paths: + - 'logs/*' + when: always + needs: [] + +.yocto-test-arm64: + extends: .yocto-test + variables: + YOCTO_HOST: arm64v8 + tags: + - arm64 + +# This is not used by any test job as we only run Yocto on arm based machi= nes. +# Keep it here so that someone having x86 hardware can easily add jobs. +.yocto-test-x86-64: + extends: .yocto-test + variables: + YOCTO_HOST: amd64 + tags: + - x86_64 + # Jobs below this line =20 archlinux-gcc: @@ -679,6 +714,22 @@ archlinux-current-gcc-riscv64-debug-randconfig: EXTRA_FIXED_RANDCONFIG: CONFIG_COVERAGE=3Dn =20 +# Yocto test jobs +yocto-qemuarm64: + extends: .yocto-test-arm64 + variables: + YOCTO_BOARD: qemuarm64 + +yocto-qemuarm: + extends: .yocto-test-arm64 + variables: + YOCTO_BOARD: qemuarm + +yocto-qemux86-64: + extends: .yocto-test-arm64 + variables: + YOCTO_BOARD: qemux86-64 + ## Test artifacts common =20 .test-jobs-artifact-common: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index ce543ef5c0..9570085a60 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -67,35 +67,6 @@ tags: - x86_64 =20 -.yocto-test: - extends: .test-jobs-common - script: - - ./automation/build/yocto/build-yocto.sh -v --log-dir=3D./logs --xen-= dir=3D`pwd` ${YOCTO_BOARD} - variables: - YOCTO_VERSION: kirkstone - CONTAINER: yocto:${YOCTO_VERSION}-${YOCTO_BOARD}-${YOCTO_HOST} - artifacts: - paths: - - 'logs/*' - when: always - needs: [] - -.yocto-test-arm64: - extends: .yocto-test - variables: - YOCTO_HOST: arm64v8 - tags: - - arm64 - -# This is not used by any test job as we only run Yocto on arm based machi= nes. -# Keep it here so that someone having x86 hardware can easily add jobs. -.yocto-test-x86-64: - extends: .yocto-test - variables: - YOCTO_HOST: amd64 - tags: - - x86_64 - # Test jobs build-each-commit-gcc: extends: .test-jobs-common @@ -253,19 +224,3 @@ qemu-smoke-riscv64-gcc: - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE} needs: - archlinux-current-gcc-riscv64-debug - -# Yocto test jobs -yocto-qemuarm64: - extends: .yocto-test-arm64 - variables: - YOCTO_BOARD: qemuarm64 - -yocto-qemuarm: - extends: .yocto-test-arm64 - variables: - YOCTO_BOARD: qemuarm - -yocto-qemux86-64: - extends: .yocto-test-arm64 - variables: - YOCTO_BOARD: qemux86-64 --=20 2.25.1 From nobody Tue May 14 00:55:45 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=1676499005; cv=none; d=zohomail.com; s=zohoarc; b=ddqRr+rg3K9pWuhfad9bFF2ocNrrpuEmzrTzY4XrWbf74XbL8sarBPMGQ9PedS6qUIq+tSEFiOzN8aMmBBYSd1SCEN16P6oRP4niu7FwOKeV5xgQIUYgD+4x4IC3R2x+JX95Ez7fDd1kW47hmlbbn6ISZRp0/1mWPUTejdlKfos= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676499005; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=30FaI02+PbJO6sEdcuA/0Ekyob6zE4VwSWJ7JK5LvbY=; b=YRsfRy+K4N8JEyGy2IRRi1NiWQbVoxoTVgjEtG5Tifu1yij9SA3sSSsDeIBCnZc4nqoKYN96I2/BoU/gYVjFjary2Ie2sV6WJpR4saryBJM1/KoTa17eoL6vLiuBj3N1L/jxDMw/ferVS9Qme+pd8nxs7o7HEIda4eK6CjUa5VA= 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 1676499005122498.5467607152034; Wed, 15 Feb 2023 14:10:05 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.496247.766893 (Exim 4.92) (envelope-from ) id 1pSPy2-0005n0-B8; Wed, 15 Feb 2023 22:09:34 +0000 Received: by outflank-mailman (output) from mailman id 496247.766893; Wed, 15 Feb 2023 22:09:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pSPy2-0005l0-1u; Wed, 15 Feb 2023 22:09:34 +0000 Received: by outflank-mailman (input) for mailman id 496247; Wed, 15 Feb 2023 22:09:33 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pSPy0-0005R2-V6 for xen-devel@lists.xenproject.org; Wed, 15 Feb 2023 22:09:32 +0000 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 6b6b6bc9-ad7d-11ed-93b5-47a8fe42b414; Wed, 15 Feb 2023 23:09:31 +0100 (CET) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A557261DBC; Wed, 15 Feb 2023 22:09:29 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60506C433EF; Wed, 15 Feb 2023 22:09:28 +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: 6b6b6bc9-ad7d-11ed-93b5-47a8fe42b414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676498969; bh=ui6UKmuaYYAlo1er5w/0SLINIVnsRORvvWH0lIJWCiw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X1s+AnGX233Zw4wwgqjkAbFic0eVhSFVv15ymDRIYLomBmWGCfIxkMAFRHE3zAH4z zkUgmRuNMoqjpO1wT0srojgHNhrBk47L/Itba66LArPtVkmsjDpCW1C1t8I+/iLs3U 8+wQ/PJDTG0jYJEbJHW0pSuQ2EDjBC8FYXtIL/F31mNRlyE8a+Z4wWjU2a14mOKw00 GinF7BkRL9cmE77WpMoWlJEvE2+ht0ya7eFkq1ZIkPnpSBXWyz3UxF7br8nme1Xt0r pQlq11lWDN/60rDkOr2vpXHrNe2RT4hvbZpDbnIwI6xhg/1DCzoOAVWNYQwVGpUXrG 8iH7RAjMcjlGQ== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, cardoe@cardoe.com, michal.orzel@amd.com, Stefano Stabellini Subject: [PATCH v2 2/3] automation: add binaries/ to artifacts for Yocto arm32 job Date: Wed, 15 Feb 2023 14:09:24 -0800 Message-Id: <20230215220925.2313528-2-sstabellini@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1676499006677100001 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini Copy the build output of Yocto builds to binaries/ for the arm32 target, and export binaries/ among the jobs artifacts so that they can be reused by other jobs. Signed-off-by: Stefano Stabellini --- Changes in v2: - only copy binaries for the arm32 target --- automation/build/yocto/build-yocto.sh | 9 +++++++++ automation/gitlab-ci/build.yaml | 1 + 2 files changed, 10 insertions(+) diff --git a/automation/build/yocto/build-yocto.sh b/automation/build/yocto= /build-yocto.sh index 3601cebc3c..dd7065e5b2 100755 --- a/automation/build/yocto/build-yocto.sh +++ b/automation/build/yocto/build-yocto.sh @@ -166,6 +166,13 @@ function project_build() { source "${YOCTODIR}/poky/oe-init-build-env" "${destdir}" =20 bitbake "${build_image}" || exit 1 + if [ $target =3D "qemuarm" ] + then + mkdir -p $OUTPUT + cp $BUILDDIR/tmp/deploy/images/qemuarm/zImage $OUTPUT + cp $BUILDDIR/tmp/deploy/images/qemuarm/xen-qemuarm $OUTPUT + cp $BUILDDIR/tmp/deploy/images/qemuarm/xen-image-minimal-qemua= rm.tar.bz2 $OUTPUT + fi ) || return 1 } =20 @@ -238,6 +245,8 @@ Options: EOF } =20 +OUTPUT=3D`pwd`/binaries + for OPTION in "$@" do case ${OPTION} in diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index f62cf21f45..d4a2aa9a5b 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -215,6 +215,7 @@ artifacts: paths: - 'logs/*' + - binaries/ when: always needs: [] =20 --=20 2.25.1 From nobody Tue May 14 00:55:45 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=1676498994; cv=none; d=zohomail.com; s=zohoarc; b=gd1eAqFX2HPDwqZ5yM1AI2URBr1ZZJtUaMAcc6rGBJedvV831cUxTqTUCRBIYH+MJw0bsl5bBf+VrUZ11VTEhuXV4L5dSYJDM1FOEhyNPdC+fKvkkQFxXVgJIYkFdth3Axvd82RxlCSz++L9nXAforJP/p6xc4khlxzHWjR06sQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676498994; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tnjjJuKWWHPbNEx89tP8/zfp/FkffdAi8rFn4Z81obw=; b=oDzgkkYc9oqLRS0KJ+owFiILiZLdOnOkyg+ZwZAE1BsklzM9TxIrVic4gDT7Qleg4I5VLRPfHJbDVHa0BSQCGS+8NNp+mtMQSB0M71YF/ibpQ/jIxfO6W1TECYmzWQ50A/ct5uaJGnHf0PfYTr0WScRv1IXo1t2PLUP8IZ7gO1Q= 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 1676498994805389.33422108043317; Wed, 15 Feb 2023 14:09:54 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.496249.766899 (Exim 4.92) (envelope-from ) id 1pSPy2-0005uG-LB; Wed, 15 Feb 2023 22:09:34 +0000 Received: by outflank-mailman (output) from mailman id 496249.766899; Wed, 15 Feb 2023 22:09:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pSPy2-0005sO-DW; Wed, 15 Feb 2023 22:09:34 +0000 Received: by outflank-mailman (input) for mailman id 496249; Wed, 15 Feb 2023 22:09:33 +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 1pSPy1-0005jC-Ls for xen-devel@lists.xenproject.org; Wed, 15 Feb 2023 22:09:33 +0000 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6bc899ac-ad7d-11ed-933c-83870f6b2ba8; Wed, 15 Feb 2023 23:09:31 +0100 (CET) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9F0DA61DD2; Wed, 15 Feb 2023 22:09:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60E2CC4339E; Wed, 15 Feb 2023 22:09:29 +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: 6bc899ac-ad7d-11ed-933c-83870f6b2ba8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676498970; bh=Iamh2qBSbFn33h3UDYRg2ZRfP+A5EhnNlQK4iEJGSF4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TvEdejUUpxdaxGd6/xhc8oQAkepOVQ5Of2rbPPW/X60e65XpSVclPHIZsVBDFCHpu LOxwRInw5kSdNcDQGjNqA3QgnrFwAUviXaCyywLVIYb7NSo39XdhQbWkKNzceI7RI/ kkiywDi7pXOHQZe9BIJUIe+cd5BBtJIjLEvBeegHnacZvzZt/CTKg/FBSYOVnjZI3I 4+lrrcE6LRJcJgKZVQLKnLU7jhjBoMjDyi6sAs2r5Eb/uZwJe2KA7FHBuft6luE0qv gCcYF5wAOwN5H11ymrMUBPZoSxzNB8xoup2Hv/OViT5bfwFtTZ5BsMvrA7U15MFUXp NaoqH3/9y8xEQ== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, cardoe@cardoe.com, michal.orzel@amd.com, Stefano Stabellini Subject: [PATCH v2 3/3] automation: expand arm32 dom0 test adding xl domain creation Date: Wed, 15 Feb 2023 14:09:25 -0800 Message-Id: <20230215220925.2313528-3-sstabellini@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1676498997096100002 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini As part of the arm32 dom0 test, also create a simple domU using xl. To do that, we need the toolstack installed in the dom0 rootfs. We switch to using the kernel and rootfs built by the Yocto arm32 job. Remove the PCI node from the host device tree: it is unused but causes a Linux hang at boot. Use xen-watchdog to trigger the domU creation for convience (/etc/local.d is not handled by rootfs.) Signed-off-by: Stefano Stabellini --- Changes in v2: - add yocto-qemuarm also to qemu-smoke-dom0-arm32-gcc-debug --- automation/gitlab-ci/test.yaml | 2 + automation/scripts/qemu-smoke-dom0-arm32.sh | 50 ++++++++++++++++----- 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9570085a60..77bb1c362d 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -172,6 +172,7 @@ qemu-smoke-dom0-arm32-gcc: needs: - *arm32-test-needs - debian-unstable-gcc-arm32 + - yocto-qemuarm =20 qemu-smoke-dom0-arm32-gcc-debug: extends: .qemu-arm32 @@ -180,6 +181,7 @@ qemu-smoke-dom0-arm32-gcc-debug: needs: - *arm32-test-needs - debian-unstable-gcc-arm32-debug + - yocto-qemuarm =20 qemu-alpine-x86_64-gcc: extends: .qemu-x86-64 diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scrip= ts/qemu-smoke-dom0-arm32.sh index 98e4d481f6..7a748bdf23 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -3,14 +3,37 @@ set -ex =20 cd binaries -# Use the kernel from Debian -curl --fail --silent --show-error --location --output vmlinuz http://http.= us.debian.org/debian/dists/bullseye/main/installer-armhf/current/images/net= boot/vmlinuz -# Use a tiny initrd based on busybox from Alpine Linux -curl --fail --silent --show-error --location --output initrd.tar.gz https:= //dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15= .1-armhf.tar.gz =20 +mkdir rootfs +cd rootfs +tar xvf ../xen-image-minimal-qemuarm.tar.bz2 +mkdir -p ./root +echo "name=3D\"test\" +memory=3D400 +vcpus=3D1 +kernel=3D\"/root/zImage\" +ramdisk=3D\"/root/initrd.cpio.gz\" +extra=3D\"console=3Dhvc0 root=3D/dev/ram0 rdinit=3D/bin/sh\" +" > root/test.cfg +echo "#!/bin/bash + +xl list + +xl create -c /root/test.cfg + +" > ./root/xen.start +echo "bash /root/xen.start" >> ./etc/init.d/xen-watchdog + +curl --fail --silent --show-error --location --output initrd.tar.gz https:= //dl-cdn.alpinelinux.org/alpine/v3.15/releases/armhf/alpine-minirootfs-3.15= .1-armhf.tar.gz mkdir rootfs cd rootfs tar xvzf ../initrd.tar.gz +find . | cpio -H newc -o | gzip > ../root/initrd.cpio.gz +cd .. +rm -rf rootfs +rm initrd.tar.gz + +cp ../zImage ./root find . | cpio -H newc -o | gzip > ../initrd.gz cd .. =20 @@ -20,22 +43,25 @@ curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-= bios/efi-virtio.rom -machine virt \ -machine virtualization=3Dtrue \ -smp 4 \ - -m 1024 \ + -m 2048 \ -serial stdio \ -monitor none \ -display none \ -machine dumpdtb=3Dvirt.dtb =20 +# XXX disable pci to avoid Linux hang +fdtput virt.dtb -p -t s /pcie@10000000 status disabled + # ImageBuilder echo 'MEMORY_START=3D"0x40000000" -MEMORY_END=3D"0x80000000" +MEMORY_END=3D"0xC0000000" =20 DEVICE_TREE=3D"virt.dtb" -XEN=3D"xen" -DOM0_KERNEL=3D"vmlinuz" +XEN=3D"xen-qemuarm" +DOM0_KERNEL=3D"zImage" DOM0_RAMDISK=3D"initrd.gz" -DOM0_CMD=3D"console=3Dhvc0 earlyprintk clk_ignore_unused root=3D/dev/ram0 = rdinit=3D/bin/sh" -XEN_CMD=3D"console=3Ddtuart dom0_mem=3D512M bootscrub=3D0" +DOM0_CMD=3D"console=3Dhvc0 earlyprintk clk_ignore_unused root=3D/dev/ram0 = rdinit=3D/sbin/init" +XEN_CMD=3D"console=3Ddtuart dom0_mem=3D1024M bootscrub=3D0" =20 NUM_DOMUS=3D0 =20 @@ -51,12 +77,12 @@ bash imagebuilder/scripts/uboot-script-gen -t tftp -d .= -c config rm -f smoke.serial set +e echo " virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000"| \ -timeout -k 1 240 \ +timeout -k 1 720 \ ./qemu-system-arm \ -machine virt \ -machine virtualization=3Dtrue \ -smp 4 \ - -m 1024 \ + -m 2048 \ -serial stdio \ -monitor none \ -display none \ --=20 2.25.1