Decouple testimage from the fvp config as it takes too long to build.
Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ci/jobs-to-kas | 4 ++++ ci/testimage.yml | 11 +++++++++++ kas/morello-fvp.yml | 8 +------- 3 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 ci/testimage.yml
diff --git a/ci/jobs-to-kas b/ci/jobs-to-kas index 95df56c..017a4bb 100755 --- a/ci/jobs-to-kas +++ b/ci/jobs-to-kas @@ -13,4 +13,8 @@ set -e -u
FILES="kas/$(echo $1 | cut -d ':' -f 1).yml"
+for i in $(echo $1 | cut -s -d ':' -f 2 | sed 's/[][,]//g'); do + FILES+=":ci/$i.yml" +done + echo $FILES diff --git a/ci/testimage.yml b/ci/testimage.yml new file mode 100644 index 0000000..0183329 --- /dev/null +++ b/ci/testimage.yml @@ -0,0 +1,11 @@ +header: + version: 11 + +local_conf_header: + testimage: | + TESTIMAGE_AUTO = "1" + + IMAGE_CLASSES:append = " testimage" + + TEST_TARGET = "OEFVPSerialTarget" + TEST_SUITES = "linuxboot" \ No newline at end of file diff --git a/kas/morello-fvp.yml b/kas/morello-fvp.yml index 7ccb36b..8be8d0c 100644 --- a/kas/morello-fvp.yml +++ b/kas/morello-fvp.yml @@ -5,18 +5,12 @@ header: machine: morello-fvp
local_conf_header: - testimage-config: | + fvp-config: |
LICENSE_FLAGS_ACCEPTED:append = " Arm-FVP-EULA"
- TESTIMAGE_AUTO = "1" - - IMAGE_CLASSES:append = " testimage" INHERIT += "fvpboot"
- TEST_TARGET = "OEFVPSerialTarget" - TEST_SUITES = "linuxboot" - FVP_CONSOLES[default] = "terminal_uart_ap" target: - core-image-minimal \ No newline at end of file