diff mbox series

[5/7] CI: clean up assignments in base.yml

Message ID 20220331183117.22389-5-ross.burton@arm.com
State New
Headers show
Series [1/7] runfvp: propagate the exit code correctly | expand

Commit Message

Ross Burton March 31, 2022, 6:31 p.m. UTC 
Split the base local.conf configuration into base (absolutely needed)
and setup (typical configuration). This is needed as oe-selftest needs a
minimal configuration to execute in, for example doesn't inherit
rm_work.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 ci/base.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/ci/base.yml b/ci/base.yml
index 9a59de79..eb5637d4 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -28,15 +28,15 @@  local_conf_header:
   base: |
     BB_SERVER_TIMEOUT = "60"
     CONF_VERSION = "2"
-    PACKAGE_CLASSES = "package_ipk"
+    BB_NUMBER_THREADS = "16"
+    PARALLEL_MAKE = "-j16"
     LICENSE_FLAGS_ACCEPTED += "armcompiler Arm-FVP-EULA"
+  setup: |
+    PACKAGE_CLASSES = "package_ipk"
     PACKAGECONFIG:remove:pn-qemu-system-native = "gtk+ sdl"
     EXTRA_IMAGE_FEATURES:append = " debug-tweaks"
-    BB_NUMBER_THREADS = "16"
-    PARALLEL_MAKE = "-j16"
-    INHERIT += "rm_work"
     PACKAGECONFIG:append:pn-perf = " coresight"
-  noptest: |
+    INHERIT += "rm_work"
     DISTRO_FEATURES:remove = "ptest"
   kvm: |
     QEMU_USE_KVM = ""