diff mbox series

[2/2] ci: move features only needed by testimage from base

Message ID 20221003171600.24454-2-jon.mason@arm.com
State New
Headers show
Series [1/2] arm-bsp/fvp: move the fvp include file to the include directory | expand

Commit Message

Jon Mason Oct. 3, 2022, 5:16 p.m. UTC 
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(-)
diff mbox series

Patch

diff --git a/ci/base.yml b/ci/base.yml
index eff466ed..3f644c1e 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -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
 
diff --git a/ci/testimage.yml b/ci/testimage.yml
index a26dcaf9..d7de7d06 100644
--- a/ci/testimage.yml
+++ b/ci/testimage.yml
@@ -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"