samples: overhaul filtering and use platform_key where it makes sense

overhaul filtering and use platform_key where it makes sense. Some scenarios are limited now with platform_allow to provide enoug coverage for those sample and not consume resource without value in CI. Signed-off-by: Anas Nashif <[email protected]>
zephyrproject-rtos · Sep 4, 2024 · ac87659 · ac87659
1 parent 10e9e18
commit ac87659
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 12 deletions.
diff --git a/samples/cpp/cpp_synchronization/sample.yaml b/samples/cpp/cpp_synchronization/sample.yaml
@@ -1,13 +1,15 @@
 sample:
   name: Syncronisation (C++)
+common:
+  platform_key:
+    - arch
+  tags: cpp
+  toolchain_exclude:
+    - xcc
+  integration_platforms:
+    - qemu_x86
 tests:
   sample.cpp.synchronization:
-    tags: cpp
-    toolchain_exclude:
-      - issm
-      - xcc
-    integration_platforms:
-      - qemu_x86
     harness: console
     harness_config:
       type: multi_line
@@ -19,12 +21,6 @@ tests:
     filter: CONFIG_PICOLIBC_SUPPORTED
     extra_configs:
       - CONFIG_PICOLIBC=y
-    tags: cpp
-    toolchain_exclude:
-      - issm
-      - xcc
-    integration_platforms:
-      - qemu_x86
     harness: console
     harness_config:
       type: multi_line

diff --git a/samples/cpp/hello_world/sample.yaml b/samples/cpp/hello_world/sample.yaml
@@ -2,6 +2,9 @@ sample:
   description: Hello World C++ sample, the simplest C++ Zephyr application
   name: hello cpp world
 common:
+  platform_key:
+    - arch
+    - simulation
   tags: introduction
   integration_platforms:
     - qemu_riscv32

diff --git a/samples/hello_world/sample.yaml b/samples/hello_world/sample.yaml
@@ -3,6 +3,8 @@ sample:
     application
   name: hello world
 common:
+  platform_key:
+    - arch
   tags: introduction
   integration_platforms:
     - native_sim

diff --git a/samples/kernel/condition_variables/condvar/sample.yaml b/samples/kernel/condition_variables/condvar/sample.yaml
@@ -1,5 +1,7 @@
 tests:
   sample.kernel.cond_var:
+    platform_key:
+      - arch
     integration_platforms:
       - native_sim
     tags:

diff --git a/samples/kernel/condition_variables/simple/sample.yaml b/samples/kernel/condition_variables/simple/sample.yaml
@@ -1,5 +1,7 @@
 tests:
   sample.kernel.cond_var.simple:
+    platform_key:
+      - arch
     integration_platforms:
       - native_sim
     tags:

diff --git a/samples/kernel/metairq_dispatch/sample.yaml b/samples/kernel/metairq_dispatch/sample.yaml
@@ -3,6 +3,8 @@ sample:
     MetaIRQ thread
   name: MetaIRQ Dispatch
 common:
+  platform_key:
+    - arch
   tags:
     - kernel
   integration_platforms:

diff --git a/samples/philosophers/sample.yaml b/samples/philosophers/sample.yaml
@@ -1,6 +1,8 @@
 sample:
   name: Dining Philosophers
 common:
+  platform_key:
+    - arch
   extra_args: DEBUG_PRINTF=1
   tags:
     - introduction
@@ -20,24 +22,40 @@ common:
 tests:
   sample.kernel.philosopher: {}
   sample.kernel.philosopher.same_prio:
+    platform_allow:
+      - native_sim
     extra_args: SAME_PRIO=1
   sample.kernel.philosopher.static:
+    platform_allow:
+      - native_sim
     extra_args: STATIC_OBJS=1
   sample.kernel.philosopher.semaphores:
+    platform_allow:
+      - native_sim
     extra_args: FORKS=SEMAPHORES
   sample.kernel.philosopher.stacks:
+    platform_allow:
+      - native_sim
     extra_args: FORKS=STACKS
   sample.kernel.philosopher.fifos:
+    platform_allow:
+      - native_sim
     extra_args: FORKS=FIFOS
   sample.kernel.philosopher.lifos:
+    platform_allow:
+      - native_sim
     extra_args: FORKS=LIFOS
   sample.kernel.philosopher.preempt_only:
+    platform_allow:
+      - native_sim
     extra_configs:
       - CONFIG_NUM_PREEMPT_PRIORITIES=6
       - CONFIG_NUM_COOP_PRIORITIES=0
       - CONFIG_BT=n
       - CONFIG_NETWORKING=n
   sample.kernel.philosopher.coop_only:
+    platform_allow:
+      - native_sim
     extra_configs:
       - CONFIG_NUM_PREEMPT_PRIORITIES=0
       - CONFIG_NUM_COOP_PRIORITIES=7