From nobody Sat May 11 10:01:03 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=1676422756; cv=none; d=zohomail.com; s=zohoarc; b=HSDjgqzrrY5MKTOgxN32vveSpz94YQtXeFUKzAEyz6aaBvBViW5p4P2A/IRzVUlpqCSYzmx9u9NEXg3N6646tjhqTJiSIuN4cydwMIF3QbwVNOUvLL46E8O2f/seFHiIA98ec25iZebJsxpZZDYs8Zlyy5Sn6eBkacAIFLyB56Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676422756; 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=Nek3HV4SU5XdQimjBGoi0BZgCTGaVHnzwTe3bqD7pxfHX8Ca3cFSxA6EYYh65CBoS7VF8oPCfSDTHbTUax9Fyz2SmqkmjIxXf94J9gRYFeENpDe/pRYI4ZLJfcVlnFOywlkn0LXdXdIcDHmd2eRD8/M6F4i4tZoj0i7JG0Hq+Yc= 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 1676422756884225.9321232187392; Tue, 14 Feb 2023 16:59:16 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.495667.766058 (Exim 4.92) (envelope-from ) id 1pS67o-0003Ji-Jg; Wed, 15 Feb 2023 00:58:20 +0000 Received: by outflank-mailman (output) from mailman id 495667.766058; Wed, 15 Feb 2023 00:58:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pS67o-0003Jb-Fu; Wed, 15 Feb 2023 00:58:20 +0000 Received: by outflank-mailman (input) for mailman id 495667; Wed, 15 Feb 2023 00:58:19 +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 1pS67n-00031p-4O for xen-devel@lists.xenproject.org; Wed, 15 Feb 2023 00:58:19 +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 d4b6d72c-accb-11ed-93b5-47a8fe42b414; Wed, 15 Feb 2023 01:58:17 +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 4B9046196F; Wed, 15 Feb 2023 00:58:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1C64C433EF; Wed, 15 Feb 2023 00:58:14 +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: d4b6d72c-accb-11ed-93b5-47a8fe42b414 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676422695; bh=Tso1s+NNc0babg5gBaw2ZRssYgQb1dk1kR0QDs857oM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h9sEomkJbhXuQA5ATZFvf47ocWOiT3f43NB5E/VOQL9pvF+Ycb4EMmDdsWd4WuiVk gEi+BNSiLbdORB2jE4vM8JBhAhv0HLnNxCX7HxWiD5voQVNZ4sdTeISEGlFiBQwOHf 11FAIcGRechRd5cbFMMBJrkovENNjM9fBxZQBN0YBGLyz4uG6KX6DONaWc2laomcf/ S4odQbxQrsM4+LGfkybjNIQRIELqr+xtlywEZbJfrQBJLbi7bQYZlXVKB7+6dzq4vn 1AI+BAY6JYiX7JTC8WDylNgt7mGlAvcPKb9/bV6Sqqgx7U6CVprscX8taFoyZ8+LnL HBN8RCpShtnfQ== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, cardoe@cardoe.com, michal.orzel@amd.com, Stefano Stabellini Subject: [PATCH 1/3] automation: move yocto jobs to build stage Date: Tue, 14 Feb 2023 16:58:09 -0800 Message-Id: <20230215005811.2126759-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: 1676422758876100004 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 --- 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 Sat May 11 10:01:03 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=1676422756; cv=none; d=zohomail.com; s=zohoarc; b=eXsszISGsWq2Rww/+zayqK56zT1oYXo/TNUOlM2D97Qup6FR0bFhk16hZ1dyWsKZw8pfEjJC8441WcNn0UhX76H33Sib+z29maWZGjndY5h2lhSic8H6TA52GlQmX6WCC8Nh324ZKo6g7Oex/uAtCTTOzbxzG3rP0/r7eIMb7k8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676422756; 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=kG5kngtyRB6uAaNq5NxsO7cEpqfKGjT7+6YP5SE7dGg=; b=fIzMWVllpm8oauew3VhWKcr9pk7ySSbJNmrot79gTKkwoMiJJjryx06O7GTgOuf07SCNmvSkkWNG0gMCz2/4ogH76o1AiL41B38JAP0KvFOrabQfvdYAxKfYZ7v1Cz0HeXU84MceJXs3/xyYFYido5xNn2GzwuaByH1zAA6Lel4= 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 1676422756288672.6621526437623; Tue, 14 Feb 2023 16:59:16 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.495668.766069 (Exim 4.92) (envelope-from ) id 1pS67p-0003Zk-R1; Wed, 15 Feb 2023 00:58:21 +0000 Received: by outflank-mailman (output) from mailman id 495668.766069; Wed, 15 Feb 2023 00:58:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pS67p-0003Zd-Nl; Wed, 15 Feb 2023 00:58:21 +0000 Received: by outflank-mailman (input) for mailman id 495668; Wed, 15 Feb 2023 00:58:20 +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 1pS67o-0003JV-JE for xen-devel@lists.xenproject.org; Wed, 15 Feb 2023 00:58:20 +0000 Received: from dfw.source.kernel.org (dfw.source.kernel.org [2604:1380:4641:c500::1]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d54c7813-accb-11ed-933c-83870f6b2ba8; Wed, 15 Feb 2023 01:58:18 +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 4177161985; Wed, 15 Feb 2023 00:58:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08509C4339C; Wed, 15 Feb 2023 00:58:15 +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: d54c7813-accb-11ed-933c-83870f6b2ba8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676422696; bh=B355pQ+xrgYs8p+di9bwo3QyG2cTAAdJVFDOYi9P610=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fEYTbW2msi7HLS15+v5NA8xSBQitLINtwfHrMbs82msPrP0fcU91QF8YzrOdwY2JT bDe1PH5f8nfHpzb1N4oYQX8E/f319qUoFPmOhaSY7XloQ3Gd7BdTjQ5+VhohCJCrAa jw0UzCfTMs2Kg0GV3jXATEPoMsCnyn/wEiEf3LtxZnr+6r/h2GfB8xY5QNUeVF/mjW 4t/HJ+IUIvoeTHSwzGA0asvi90/7sj7WjqipZNOT/M0Ic+lPm1i5YaangdvcozpI9v dLeUz5PmWxu+EPHkfNX+opsgl3kgr7FtxXsoDyvgPqrCpmZZbEx2LydYMY7rLAoeX7 WjgcWNiRpcj1A== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, cardoe@cardoe.com, michal.orzel@amd.com, Stefano Stabellini Subject: [PATCH 2/3] automation: add binaries/ to artifacts for Yocto jobs Date: Tue, 14 Feb 2023 16:58:10 -0800 Message-Id: <20230215005811.2126759-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: 1676422756898100001 Content-Type: text/plain; charset="utf-8" From: Stefano Stabellini Copy the build output of Yocto builds to binaries/ and export binaries/ among the jobs artifacts so that they can be reused by other jobs. Signed-off-by: Stefano Stabellini --- automation/build/yocto/build-yocto.sh | 6 ++++++ automation/gitlab-ci/build.yaml | 1 + 2 files changed, 7 insertions(+) diff --git a/automation/build/yocto/build-yocto.sh b/automation/build/yocto= /build-yocto.sh index 3601cebc3c..d0fcaacf06 100755 --- a/automation/build/yocto/build-yocto.sh +++ b/automation/build/yocto/build-yocto.sh @@ -166,6 +166,10 @@ function project_build() { source "${YOCTODIR}/poky/oe-init-build-env" "${destdir}" =20 bitbake "${build_image}" || exit 1 + 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-qemuarm.t= ar.bz2 $OUTPUT ) || return 1 } =20 @@ -238,6 +242,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 Sat May 11 10:01:03 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=1676422758; cv=none; d=zohomail.com; s=zohoarc; b=CluKyD4hwmKM04CUX85KdgzQzyWbYXcYXp0nhckHjKMsbDQlJBz6a272ib5qyS1MJwpKm5mMPl0k9bVxQtxLRUl6yEkdGo0BtGkPgFW1YGG5PvbdNZGslUMSWupE8ZNNrEO3f22/Na8z+alAXizWLP3GWFfghxgmmbs/XDp1kJg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676422758; 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=KAy3Xl8SwN2w3VT7OYoKf3z+H/obSUJO/epiaXeLh2c=; b=TM1GZmJYJcOXIMIoO2+eevTpzR3SyJd6tFt5Z5GfdSdlGPBhPZCfJmJfPwKWwvfT7f1YRl53nzo90JOUkVNLKnJyHojV5/uVK68ZYasFu+k80EBm/yrb9aQC+eCFgPlyj039Qd+Qu7ybb1oddbzJEvkTaBsPtitGYGmEdorZNKM= 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 1676422758586968.9306176448321; Tue, 14 Feb 2023 16:59:18 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.495669.766073 (Exim 4.92) (envelope-from ) id 1pS67q-0003dM-5X; Wed, 15 Feb 2023 00:58:22 +0000 Received: by outflank-mailman (output) from mailman id 495669.766073; Wed, 15 Feb 2023 00:58:22 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pS67p-0003ca-WB; Wed, 15 Feb 2023 00:58:21 +0000 Received: by outflank-mailman (input) for mailman id 495669; Wed, 15 Feb 2023 00:58:21 +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 1pS67o-0003JV-VE for xen-devel@lists.xenproject.org; Wed, 15 Feb 2023 00:58:20 +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 d65b45c3-accb-11ed-933c-83870f6b2ba8; Wed, 15 Feb 2023 01:58:19 +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 0AF81B81EA7; Wed, 15 Feb 2023 00:58:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 01695C433A0; Wed, 15 Feb 2023 00:58:16 +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: d65b45c3-accb-11ed-933c-83870f6b2ba8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676422697; bh=T5WSKBYQzVjhzysjUnGo4/jVHe9t0Ka2SdLf2aTZm00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fnFI1tB7BJHYp+pyQLmbq10Lq+vDJiCWpC8BBOLXpn+yfuUe3Ia7YNJ1x0Hp7pnTa WphNfy9yCmIxA0n6mejY+3WR0s+MaLSpYLyeFJOOq/d374btgAw1J1j2EuB9OO1Snx fjy2alZ2N2zwtt6kkXmBEAErI1df3znr2lqppqtfTvBg7dBrEGd4x9o8UTtDFnwiLN +gR/Dc/cwh4lDlHm7lmIhYF/MSlrfw6VWMzz2Sdql1cgu5jXBNVKFc0lmX4h4v1GqX ed5cRPfSnAHvaFA/kku3+Ao+ppVwlcwmOJz93YqpY9JN/r8aosOM8QuQnPPe4Zt0sl FZOb9LYK3v6/w== From: Stefano Stabellini To: xen-devel@lists.xenproject.org Cc: sstabellini@kernel.org, cardoe@cardoe.com, michal.orzel@amd.com, Stefano Stabellini Subject: [PATCH 3/3] automation: expand arm32 dom0 test adding xl domain creation Date: Tue, 14 Feb 2023 16:58:11 -0800 Message-Id: <20230215005811.2126759-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: 1676422760643100007 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 --- automation/gitlab-ci/test.yaml | 1 + automation/scripts/qemu-smoke-dom0-arm32.sh | 50 ++++++++++++++++----- 2 files changed, 39 insertions(+), 12 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9570085a60..7bfdd02e64 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 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