@@ -38,14 +38,8 @@ local_conf_header:
PACKAGECONFIG:append:pn-perf = " coresight"
INHERIT += "rm_work"
DISTRO_FEATURES:remove = "ptest"
- kvm: |
- QEMU_USE_KVM = ""
perf: |
CORE_IMAGE_EXTRA_INSTALL += "perf"
- sshkeys: |
- CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys"
- universally_failing_tests: |
- TEST_SUITES:remove = "opkg"
machine: unset
@@ -5,9 +5,15 @@ local_conf_header:
testimage: |
IMAGE_CLASSES += "testimage"
TESTIMAGE_AUTO = "1"
+ kvm: |
+ QEMU_USE_KVM = ""
slirp: |
TEST_RUNQEMUPARAMS = "slirp"
TEST_SERVER_IP = "127.0.0.1"
QEMU_USE_SLIRP = "1"
sshd: |
IMAGE_FEATURES:append = " ssh-server-dropbear"
+ sshkeys: |
+ CORE_IMAGE_EXTRA_INSTALL += "ssh-pregen-hostkeys"
+ universally_failing_tests: |
+ TEST_SUITES:remove = "opkg"
Move the features uniquely needed for system images to the testimage file. This should reduce the image size and amount of things needing to be built for machines that do not run testimage. Signed-off-by: Jon Mason <jon.mason@arm.com> --- ci/base.yml | 6 ------ ci/testimage.yml | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)