@@ -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
new file mode 100644
@@ -0,0 +1,4 @@
+header:
+ version: 11
+ includes:
+ - kas/arm-systemready-firmware.yml
new file mode 100644
@@ -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
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 <Debbie.Martin@arm.com> --- .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