From 94a08c23b0a5b6b8a406e818941243f9162e2b80 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Feb 2022 10:56:05 +0000 Subject: [PATCH] CI: improve coverage of corstone1000 Consolidate the CS1K kas files into a common file, and respect the platform policy by setting the DISTRO to poky-tiny. Also add the CS1K-specific recipes psa-arch-tests and ffa-debugfs-mod to the build. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- ci/corstone1000-common.yml | 18 ++++++++++++++++++ ci/corstone1000-fvp.yml | 8 +------- ci/corstone1000-mps3.yml | 8 +------- 3 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 ci/corstone1000-common.yml diff --git a/ci/corstone1000-common.yml b/ci/corstone1000-common.yml new file mode 100644 index 00000000..f92e0f22 --- /dev/null +++ b/ci/corstone1000-common.yml @@ -0,0 +1,18 @@ +header: + version: 11 + includes: + - ci/base.yml + - ci/meta-openembedded.yml + +local_conf_header: + image: | + INITRAMFS_IMAGE_BUNDLE = "0" + INITRAMFS_IMAGE:remove = "corstone1000-initramfs-image" + CORE_IMAGE_EXTRA_INSTALL += "psa-arch-tests" + CORE_IMAGE_EXTRA_INSTALL += "optee-client" + CORE_IMAGE_EXTRA_INSTALL += "ffa-debugfs-mod" + +distro: poky-tiny + +target: + - core-image-minimal diff --git a/ci/corstone1000-fvp.yml b/ci/corstone1000-fvp.yml index 39a92b3c..e4659a3f 100644 --- a/ci/corstone1000-fvp.yml +++ b/ci/corstone1000-fvp.yml @@ -1,12 +1,6 @@ header: version: 11 includes: - - ci/base.yml - - ci/meta-openembedded.yml - -local_conf_header: - custom-local-conf: | - INITRAMFS_IMAGE_BUNDLE = "0" - INITRAMFS_IMAGE:remove = "corstone1000-initramfs-image" + - ci/corstone1000-common.yml machine: corstone1000-fvp diff --git a/ci/corstone1000-mps3.yml b/ci/corstone1000-mps3.yml index 21635938..2df7d976 100644 --- a/ci/corstone1000-mps3.yml +++ b/ci/corstone1000-mps3.yml @@ -1,12 +1,6 @@ header: version: 11 includes: - - ci/base.yml - - ci/meta-openembedded.yml - -local_conf_header: - custom-local-conf: | - INITRAMFS_IMAGE_BUNDLE = "0" - INITRAMFS_IMAGE:remove = "corstone1000-initramfs-image" + - ci/corstone1000-common.yml machine: corstone1000-mps3