From patchwork Mon Jan 8 20:11:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Debbie Martin X-Patchwork-Id: 37501 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DA76C3DA6E for ; Mon, 8 Jan 2024 20:11:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.213.1704744689908471209 for ; Mon, 08 Jan 2024 12:11:30 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: debbie.martin@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 450C0C15 for ; Mon, 8 Jan 2024 12:12:15 -0800 (PST) Received: from e127725.arm.com (unknown [10.57.74.190]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F036D3F73F for ; Mon, 8 Jan 2024 12:11:28 -0800 (PST) From: Debbie Martin To: meta-arm@lists.yoctoproject.org Subject: [nanbield 1/2] arm-systemready: Add parted dependency and inherit testimage Date: Mon, 8 Jan 2024 20:11:15 +0000 Message-Id: <20240108201116.1979608-1-Debbie.Martin@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 08 Jan 2024 20:11:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5321 Add the parted-native dependency explicitly which is needed to use wic commands. Also explicitly inherit testimage. This means that the kas config is no longer required to include it in IMAGE_CLASSES. Signed-off-by: Debbie Martin --- kas/arm-systemready-ir-acs.yml | 5 ----- meta-arm-systemready/classes/arm-systemready-acs.bbclass | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/kas/arm-systemready-ir-acs.yml b/kas/arm-systemready-ir-acs.yml index 38604d7f..aef3e712 100644 --- a/kas/arm-systemready-ir-acs.yml +++ b/kas/arm-systemready-ir-acs.yml @@ -8,10 +8,5 @@ env: # The full testimage run typically takes around 12-24h on fvp-base. TEST_OVERALL_TIMEOUT: "${@ 24*60*60}" -local_conf_header: - systemready-ir-acs: | - IMAGE_CLASSES:append = " testimage" - - target: - arm-systemready-ir-acs diff --git a/meta-arm-systemready/classes/arm-systemready-acs.bbclass b/meta-arm-systemready/classes/arm-systemready-acs.bbclass index e9888023..28e800c8 100644 --- a/meta-arm-systemready/classes/arm-systemready-acs.bbclass +++ b/meta-arm-systemready/classes/arm-systemready-acs.bbclass @@ -12,12 +12,11 @@ INHIBIT_DEFAULT_DEPS = "1" COMPATIBLE_HOST = "aarch64-*" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit nopackages deploy rootfs-postcommands ${IMAGE_CLASSES} python3native +inherit nopackages deploy rootfs-postcommands ${IMAGE_CLASSES} python3native testimage do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" -do_testimage[depends] += "mtools-native:do_populate_sysroot" # Deploy with this suffix so it is picked up in the machine configuration IMAGE_DEPLOY_SUFFIX ?= ".wic" @@ -80,7 +79,9 @@ RM_WORK_EXCLUDE_ITEMS += "${@ os.path.basename(d.getVar('TEST_LOG_DIR')) }" do_testimage[postfuncs] += "acs_logs_handle" do_testimage[depends] += "edk2-test-parser-native:do_populate_sysroot \ - arm-systemready-scripts-native:do_populate_sysroot" + arm-systemready-scripts-native:do_populate_sysroot \ + mtools-native:do_populate_sysroot \ + parted-native:do_populate_sysroot" # Process the logs python acs_logs_handle() { From patchwork Mon Jan 8 20:11:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Debbie Martin X-Patchwork-Id: 37502 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 aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 406B7C47079 for ; Mon, 8 Jan 2024 20:11:33 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.217.1704744691764469956 for ; Mon, 08 Jan 2024 12:11:31 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: debbie.martin@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 38327C15 for ; Mon, 8 Jan 2024 12:12:17 -0800 (PST) Received: from e127725.arm.com (unknown [10.57.74.190]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C92743F73F for ; Mon, 8 Jan 2024 12:11:30 -0800 (PST) From: Debbie Martin To: meta-arm@lists.yoctoproject.org Subject: [nanbield 2/2] ci: Add Arm SystemReady firmware and IR ACS builds Date: Mon, 8 Jan 2024 20:11:16 +0000 Message-Id: <20240108201116.1979608-2-Debbie.Martin@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240108201116.1979608-1-Debbie.Martin@arm.com> References: <20240108201116.1979608-1-Debbie.Martin@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 08 Jan 2024 20:11:33 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/5322 Add CI builds for Arm SystemReady Firmware within the fvp-base CI job and a new Arm SystemReady IR ACS build job. Add the CI kas config for each of these builds. The ACS build can be controlled by the ACS_TEST GitLab variable to specify whether or not to run the testimage. If this variable is not set, the testimage step will not run. The job tag can be controlled by the ACS_TAG GitLab variable. Signed-off-by: Debbie Martin --- .gitlab-ci.yml | 20 ++++++++++++++++++-- ci/arm-systemready-firmware.yml | 4 ++++ ci/arm-systemready-ir-acs.yml | 14 ++++++++++++++ 3 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 ci/arm-systemready-firmware.yml create mode 100644 ci/arm-systemready-ir-acs.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9dee5807..22ecfd71 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,8 @@ variables: # by default FF_KUBERNETES_HONOR_ENTRYPOINT: 1 FF_USE_LEGACY_KUBERNETES_EXECUTION_STRATEGY: 0 + ACS_TEST: 0 + ACS_TAG: "" stages: - prep @@ -67,8 +69,8 @@ stages: name: "logs" when: always paths: - - $CI_PROJECT_DIR/work/build/tmp/work*/**/temp/log.do_*.* - - $CI_PROJECT_DIR/work/build/tmp/work*/**/testimage/* + - $CI_PROJECT_DIR/work/build/tmp*/work*/**/temp/log.do_*.* + - $CI_PROJECT_DIR/work/build/tmp*/work*/**/testimage/* # # Prep stage, update repositories once. @@ -126,6 +128,20 @@ fvp-base: matrix: - TESTING: testimage - FIRMWARE: edk2 + - SYSTEMREADY_FIRMWARE: arm-systemready-firmware + +arm-systemready-ir-acs: + extends: .build + timeout: 12h + parallel: + matrix: + # arm-systemready-ir-acs must be specified after fvp-base for ordering + # purposes for the jobs-to-kas output. It is not enough to just have it + # in the job name because fvp-base.yml overwrites the target. + - PLATFORM: fvp-base + ARM_SYSTEMREADY_IR_ACS: arm-systemready-ir-acs + tags: + - ${ACS_TAG} fvps: extends: .build diff --git a/ci/arm-systemready-firmware.yml b/ci/arm-systemready-firmware.yml new file mode 100644 index 00000000..1854c2ab --- /dev/null +++ b/ci/arm-systemready-firmware.yml @@ -0,0 +1,4 @@ +header: + version: 11 + includes: + - kas/arm-systemready-firmware.yml diff --git a/ci/arm-systemready-ir-acs.yml b/ci/arm-systemready-ir-acs.yml new file mode 100644 index 00000000..6cfead6c --- /dev/null +++ b/ci/arm-systemready-ir-acs.yml @@ -0,0 +1,14 @@ +header: + version: 11 + includes: + - kas/arm-systemready-ir-acs.yml + +env: + ACS_TEST: "0" + +local_conf_header: + testimage: | + TESTIMAGE_AUTO = "${ACS_TEST}" + +target: + - arm-systemready-ir-acs