From nobody Sun May 12 22:27:06 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=1676678910; cv=none; d=zohomail.com; s=zohoarc; b=TadEOcw7riBVB0wnbkAF0FtnxAjvEsNj5r4Gggeyg/mkV52mQzUKgUQtubYnc+ZJQ8+A2UPVL1l2Z+q8cQ/q4Wjo2r+TKgNTIFR6R8i9Nd7vv/1RQwPzYoHuwFGNhZsow/4bCRSQFX8IiVLeJslYbo4QwnEYWot8WomYnTgLh7M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676678910; 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=JPhdBpdfYQIyqa0so0gjn431IO+PLJQ3q65W62zj9C0=; b=mA5EGzG6BIC0VpVq3OmbA+gqpHHLrrWdoeVdKMGV0ILljwLazRmvnhm9vK3jALZBcOo7/cx24UWb5u63Qjz3Zd9BZUE0vNepa2aN0IEyrmMmhFWpo4etb3mPgGlHsQb5lCTi1oMSMJ9piktWqrJ1Fqx6XBcmuA1Z665AQ7/WAzI= 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 1676678910963726.7638655000387; Fri, 17 Feb 2023 16:08:30 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.497383.768357 (Exim 4.92) (envelope-from ) id 1pTAlf-0004Rh-30; Sat, 18 Feb 2023 00:07:55 +0000 Received: by outflank-mailman (output) from mailman id 497383.768357; Sat, 18 Feb 2023 00:07:55 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pTAlf-0004RY-04; Sat, 18 Feb 2023 00:07:55 +0000 Received: by outflank-mailman (input) for mailman id 497383; Sat, 18 Feb 2023 00:07:54 +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 1pTAle-00049k-9V for xen-devel@lists.xenproject.org; Sat, 18 Feb 2023 00:07:54 +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 48f14359-af20-11ed-93b5-47a8fe42b414; Sat, 18 Feb 2023 01:07:52 +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 502FE62027; Sat, 18 Feb 2023 00:07:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F26F5C433D2; Sat, 18 Feb 2023 00:07:49 +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: 48f14359-af20-11ed-93b5-47a8fe42b414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676678870; bh=eUlQ2APESts0KA52L+gW/CObn9jC9xSw37MuWYocq/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S/6bIW8WuMo6WZuj+xNOII5k/p1taF2QhZ9oyCU1Hvf880dbJMlgouSWHR1+Lc7c2 T85c6lClqNHXHmV/ViHl6Flg0+eTy5lukFV81JO5Rj6GPE2Q0vC6T1SzddAx1P7ZS0 H+Q1r9Z4AdwKsM0PX+3KxtTGbaAAv2zdYpUwiX1HqHqeSd3NCthBu4gbrxYEFQeJOl Ok2joly/5PzlcIbYPju7dfY4J4NkPAqfqabjJnmoB/DQS6IOU8BxSEoudcYLj6nASM ifWzwXA4kQK0BW8AavDtXYwAvgg2gUVZJLO8KCPpw/nOBthvwhNviO+E4EkGT8jDPs 5EzRZjmghAxYA== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, cardoe@cardoe.com, michal.orzel@amd.com, Stefano Stabellini Subject: [PATCH v3 1/3] automation: move yocto jobs to build stage Date: Fri, 17 Feb 2023 16:07:45 -0800 Message-Id: <20230218000747.2965719-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: 1676678911698100002 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 079e9b73f6..b6ae1c663b 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: @@ -699,6 +734,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 c0b4a90e0d..00273b21c8 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 @@ -317,19 +288,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 Sun May 12 22:27:06 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=1676678911; cv=none; d=zohomail.com; s=zohoarc; b=MdtYxVTPoOfH/pFlaXknCPRKUlDMaURFazYnOwGlN+TXL1UQUuh2rjPyFKuPmPm6BSJiq2sKOKnVHZep2gHFHPw5T0Z+S81HJSLW2BjNlQH0CCkPmIsf0aoqhtRPHtkEOIjQMDK2yo5B+KEk0B7ECmbmVi08CRZNbj/+6ujTwBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676678911; 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=z8nK65C8DHsU19IErIQSj8PYu6z0n2C/VJJYKbWdVac=; b=IkPZ7qV7dMWOBXx7v9krJ2Uj6BHDWqI4/40fq4ZL/XZkYnXYk0gjKKuVYiDIK70fGgh3ZfKjxqCBc4nOZSVizA2mJeeaK4r0DnwwGdCRHXSP/RB+LhZOCHwwK++Dk34jAi4zmqEKlf+MisNTe2uHsPAvFyP6slpb4aT8oOcF/zM= 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 1676678911677399.12811153438315; Fri, 17 Feb 2023 16:08:31 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.497384.768369 (Exim 4.92) (envelope-from ) id 1pTAlh-0004i6-C3; Sat, 18 Feb 2023 00:07:57 +0000 Received: by outflank-mailman (output) from mailman id 497384.768369; Sat, 18 Feb 2023 00:07:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pTAlh-0004hu-9A; Sat, 18 Feb 2023 00:07:57 +0000 Received: by outflank-mailman (input) for mailman id 497384; Sat, 18 Feb 2023 00:07:55 +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 1pTAlf-00049k-Qe for xen-devel@lists.xenproject.org; Sat, 18 Feb 2023 00:07:55 +0000 Received: from dfw.source.kernel.org (dfw.source.kernel.org [2604:1380:4641:c500::1]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 498b7b5f-af20-11ed-93b5-47a8fe42b414; Sat, 18 Feb 2023 01:07:53 +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 5395D6209D; Sat, 18 Feb 2023 00:07:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1560DC4339C; Sat, 18 Feb 2023 00:07:50 +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: 498b7b5f-af20-11ed-93b5-47a8fe42b414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676678871; bh=ReIRkrUsD0aUe+sTs/xO/eCMbv89yibMdXJjNiWEuAk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RQAS7xGmEushY27lNqqHLEenfNcDuYaKE+/0N40gzg7jRPHhPRb9MtotVPHL3bu/D px9xCTX686rQk/SkR0+UWcTL6a12fxpTvOiejKVQGS1DydYxEbUdf/mubzDnlK3dKH FZ39joQ6KWFt3Zns8SrXTmRO3kQ+fVvaSc4aN9Sl38culfDEVbPmEFHfS17ZNRASgt CTHlF6hYob4UIEmF8u7x2OZjE1x7Cc056A034k1D5NcwxeQoGDY34p4/8eBi0AHv7K lH2TvmDcHEdnII1FyPmu/AJ2a1DOKVxIyAV1c9eIsV03057wsILS30RrtxnawIkpMw YASyorI4o+/GA== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, cardoe@cardoe.com, michal.orzel@amd.com, Stefano Stabellini Subject: [PATCH v3 2/3] automation: add binaries/ to artifacts for Yocto arm32 job Date: Fri, 17 Feb 2023 16:07:46 -0800 Message-Id: <20230218000747.2965719-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: 1676678913410100005 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 Reviewed-by: Michal Orzel --- Changes in v2: - add --copy-output so that whether the binaries get copied or not is user selectable - rename OUTPUT to OUTPUTDIR and move it up in the file --- automation/build/yocto/build-yocto.sh | 16 ++++++++++++++++ automation/gitlab-ci/build.yaml | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/automation/build/yocto/build-yocto.sh b/automation/build/yocto= /build-yocto.sh index 3601cebc3c..93ce81ce82 100755 --- a/automation/build/yocto/build-yocto.sh +++ b/automation/build/yocto/build-yocto.sh @@ -18,6 +18,7 @@ CACHEDIR=3D"$HOME/yocto-cache" LOGDIR=3D"$HOME/logs" XENDIR=3D"$HOME/xen" BUILDDIR=3D"$HOME/build" +OUTPUTDIR=3D`pwd`/binaries =20 # what yocto bsp we support TARGET_SUPPORTED=3D"qemuarm qemuarm64 qemux86-64" @@ -31,6 +32,7 @@ do_build=3D"y" do_run=3D"y" do_localsrc=3D"n" do_dump=3D"n" +do_copy=3D"n" build_result=3D0 =20 # layers to include in the project @@ -166,6 +168,16 @@ function project_build() { source "${YOCTODIR}/poky/oe-init-build-env" "${destdir}" =20 bitbake "${build_image}" || exit 1 + if [ $do_copy =3D "y" ] + then + if [ $target =3D "qemuarm" ] + then + mkdir -p $OUTPUTDIR + cp $BUILDDIR/tmp/deploy/images/qemuarm/zImage $OUTPUTDIR + cp $BUILDDIR/tmp/deploy/images/qemuarm/xen-qemuarm $OUTPUT= DIR + cp $BUILDDIR/tmp/deploy/images/qemuarm/xen-image-minimal-q= emuarm.tar.bz2 $OUTPUTDIR + fi + fi ) || return 1 } =20 @@ -235,6 +247,7 @@ Options: Default: ${CACHEDIR} --layer-dir=3DDIR directory containing the checkout of yocto layers Default: ${YOCTODIR} + --copy-output Copy output binaries to binaries/ EOF } =20 @@ -290,6 +303,9 @@ do --layer-dir=3D*) YOCTODIR=3D"${OPTION#*=3D}" ;; + --copy-output) + do_copy=3D"y" + ;; --*) echo "Invalid option ${OPTION}" help diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index b6ae1c663b..d731642785 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -208,13 +208,14 @@ - /^coverity-tested\/.*/ - /^stable-.*/ script: - - ./automation/build/yocto/build-yocto.sh -v --log-dir=3D./logs --xen-= dir=3D`pwd` ${YOCTO_BOARD} + - ./automation/build/yocto/build-yocto.sh -v --log-dir=3D./logs --xen-= dir=3D`pwd` ${YOCTO_BOARD} ${YOCTO_OUTPUT} variables: YOCTO_VERSION: kirkstone CONTAINER: yocto:${YOCTO_VERSION}-${YOCTO_BOARD}-${YOCTO_HOST} artifacts: paths: - 'logs/*' + - binaries/ when: always needs: [] =20 @@ -744,6 +745,7 @@ yocto-qemuarm: extends: .yocto-test-arm64 variables: YOCTO_BOARD: qemuarm + YOCTO_OUTPUT: --copy-output =20 yocto-qemux86-64: extends: .yocto-test-arm64 --=20 2.25.1 From nobody Sun May 12 22:27:06 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=1676678912; cv=none; d=zohomail.com; s=zohoarc; b=S17cxL7jgIYGiCm9fpyJBcuDCvfIa4n88iVO0/gXlsOFZmPw5JocsLv3irxUUIAmT2O7MzZPO3sSRwVFwPZFE31+7u4+Sbk2PnLU544rcZ9XZxDXiwguNnDMQfrb/1DX/iND1nhkT+SVktyTbvZ8rnfaMgqAF9iLMrgRJ8Mugd8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676678912; 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=de9UPA1auvKQ9EngNm0ciyQ8atkWL2Fn+YiX1BNeIA0=; b=hFWlsGqwup1Euptk9H92UnH+KWWtvKAXh9mpbe8uzIweeA3GEPV2JqA7TZufODV7Y9zvhvwegFVddFCjJVDhJaYp3DGgoUDJUmaliAMUVszunql9rNWC1SKUD1PR5EpZ52Y7PzzJMrCn/eSTxdyROwzjDWy8F1CW6o1C2BN9EP8= 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 1676678912613444.932269292893; Fri, 17 Feb 2023 16:08:32 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.497385.768380 (Exim 4.92) (envelope-from ) id 1pTAli-0004yH-JI; Sat, 18 Feb 2023 00:07:58 +0000 Received: by outflank-mailman (output) from mailman id 497385.768380; Sat, 18 Feb 2023 00:07:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pTAli-0004y7-GT; Sat, 18 Feb 2023 00:07:58 +0000 Received: by outflank-mailman (input) for mailman id 497385; Sat, 18 Feb 2023 00:07:56 +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 1pTAlg-0004hK-IB for xen-devel@lists.xenproject.org; Sat, 18 Feb 2023 00:07:56 +0000 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 4a684696-af20-11ed-933d-83870f6b2ba8; Sat, 18 Feb 2023 01:07:54 +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 0D48AB81F9C; Sat, 18 Feb 2023 00:07:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 16A1FC4339B; Sat, 18 Feb 2023 00:07:51 +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: 4a684696-af20-11ed-933d-83870f6b2ba8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676678872; bh=rUrGZbmK5uUfTRLHvZznH/0nYIsKj1VaIsQqXSJ4KcE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fdXfXs0hIdsyOK/tzub8r8b40+y1tj/20arJhlZdrXRSh4aSGvc/hzZIcWuwvcNjS EOUAT8mB9eQ9G+erZQA1ahtN0+SDK88M0+B5DPNqlYtvz6PyTa7ah36onBZbi0lQ7R tBeLKAfNpcK6IHtGeOiioj0Q3Ec4pTiKSghSEoRJZYWWXpKNgJKaOC+CpoLNjNk5l2 OGhr6zd2hIu8g3JubpRzVblukLM2drJlIaYLNOjdkTy3rLWJvEkJe/0r3c+ySUIZd/ kzhwZ7Wh8SzCRjwwWNwIk5KGl3nFrFMuc+hCrVNB9kmSwifmiMYKz+N6Ex3lDrAhMt wqC7AmYezZ4iQ== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, cardoe@cardoe.com, michal.orzel@amd.com, Stefano Stabellini Subject: [PATCH v3 3/3] automation: expand arm32 dom0 test adding xl domain creation Date: Fri, 17 Feb 2023 16:07:47 -0800 Message-Id: <20230218000747.2965719-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: 1676678913608100007 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 Reviewed-by: Michal Orzel --- Changes in v2: - remove unsued debian-unstable-gcc-arm32 dependency for qemu-smoke-dom0-arm32-gcc - remove job qemu-smoke-dom0-arm32-gcc-debug as it doesn't make sense anymore - grep for both dom0 and domU prompts in qemu-smoke-dom0-arm32.sh --- automation/gitlab-ci/test.yaml | 11 +---- automation/scripts/qemu-smoke-dom0-arm32.sh | 52 +++++++++++++++------ 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 00273b21c8..6d09c97702 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -171,15 +171,7 @@ qemu-smoke-dom0-arm32-gcc: - ./automation/scripts/qemu-smoke-dom0-arm32.sh 2>&1 | tee ${LOGFILE} needs: - *arm32-test-needs - - debian-unstable-gcc-arm32 - -qemu-smoke-dom0-arm32-gcc-debug: - extends: .qemu-arm32 - script: - - ./automation/scripts/qemu-smoke-dom0-arm32.sh 2>&1 | tee ${LOGFILE} - needs: - - *arm32-test-needs - - debian-unstable-gcc-arm32-debug + - yocto-qemuarm =20 qemu-smoke-dom0less-arm32-gcc: extends: .qemu-arm32 @@ -244,6 +236,7 @@ qemu-smoke-dom0less-arm32-gcc-debug-without-dom0: 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..2c80df089f 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 \ @@ -66,5 +92,5 @@ timeout -k 1 240 \ -bios /usr/lib/u-boot/qemu_arm/u-boot.bin |& tee smoke.serial =20 set -e -(grep -q "^/ #" smoke.serial) || exit 1 +(grep -q "Domain-0" smoke.serial && grep -q "^/ #" smoke.serial) || exit 1 exit 0 --=20 2.25.1