arm-systemready: Add parted dependency and inherit testimage
PATCH 1/2 arm-systemready: Add parted dependency and inherit testimage
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 <[email protected]>
--- kas/arm-systemready-ir-acs.yml | 5 ----- meta-arm-systemready/classes/arm-systemready-acs.bbclass | 7 ++++--- 2 files changed, 4 insertions(+), 8 deletions(-)
kas/arm-systemready-ir-acs.yml +0 -5
@@ -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
meta-arm-systemready/classes/arm-systemready-acs.bbclass +4 -3
@@ -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() {
Signature · 1 line
2.25.1
PATCH 2/2 ci: Add Arm SystemReady firmware and IR ACS builds
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 <[email protected]>
--- .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
.gitlab-ci.yml +18 -2
@@ -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
ci/arm-systemready-firmware.yml new file +4 -0
@@ -0,0 +1,4 @@ +header: + version: 11 + includes: + - kas/arm-systemready-firmware.yml
ci/arm-systemready-ir-acs.yml new file +14 -0
@@ -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
Signature · 1 line
2.25.1