From 6f4d0e948870e4505807392393b7136793c57d88 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Fri, 9 Oct 2026 06:32:33 -1000
Subject: [PATCH] [debug] Collapse duplicate CI test variants (#20404)

---
 tests/components/debug/test.bk72xx-ard.yaml     | 3 ++-
 tests/components/debug/test.esp32-ard.yaml      | 3 ++-
 tests/components/debug/test.esp32-idf.yaml      | 5 ++---
 tests/components/debug/test.esp32-s2-idf.yaml   | 8 --------
 tests/components/debug/test.esp8266-ard.yaml    | 3 ++-
 tests/components/debug/test.host.yaml           | 3 ++-
 tests/components/debug/test.ln882x-ard.yaml     | 6 ------
 tests/components/debug/test.nrf52-adafruit.yaml | 3 ++-
 tests/components/debug/test.nrf52-mcumgr.yaml   | 3 ++-
 tests/components/debug/test.nrf52-xiao-ble.yaml | 1 -
 tests/components/debug/test.rp2040-ard.yaml     | 3 ++-
 tests/components/debug/test.rtl87xx-ard.yaml    | 6 ------
 12 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 tests/components/debug/test.esp32-s2-idf.yaml
 delete mode 100644 tests/components/debug/test.ln882x-ard.yaml
 delete mode 100644 tests/components/debug/test.nrf52-xiao-ble.yaml
 delete mode 100644 tests/components/debug/test.rtl87xx-ard.yaml

diff --git a/tests/components/debug/test.bk72xx-ard.yaml b/tests/components/debug/test.bk72xx-ard.yaml
index fdae374788..65320a47d6 100644
--- a/tests/components/debug/test.bk72xx-ard.yaml
+++ b/tests/components/debug/test.bk72xx-ard.yaml
@@ -1,4 +1,5 @@
-<<: !include common.yaml
+packages:
+  debug: !include common.yaml
 
 sensor:
   - platform: debug
diff --git a/tests/components/debug/test.esp32-ard.yaml b/tests/components/debug/test.esp32-ard.yaml
index 8f93b0925e..cdb1615be1 100644
--- a/tests/components/debug/test.esp32-ard.yaml
+++ b/tests/components/debug/test.esp32-ard.yaml
@@ -1,4 +1,5 @@
-<<: !include common.yaml
+packages:
+  debug: !include common.yaml
 
 esp32:
   cpu_frequency: 240MHz
diff --git a/tests/components/debug/test.esp32-idf.yaml b/tests/components/debug/test.esp32-idf.yaml
index 6a9996ad06..73bc97b2a9 100644
--- a/tests/components/debug/test.esp32-idf.yaml
+++ b/tests/components/debug/test.esp32-idf.yaml
@@ -1,12 +1,11 @@
-<<: !include common.yaml
+packages:
+  debug: !include common.yaml
 
 esp32:
   cpu_frequency: 240MHz
 
 sensor:
   - platform: debug
-    free:
-      name: "Heap Free"
     psram:
       name: "Free PSRAM"
     fragmentation:
diff --git a/tests/components/debug/test.esp32-s2-idf.yaml b/tests/components/debug/test.esp32-s2-idf.yaml
deleted file mode 100644
index 80919b0bab..0000000000
--- a/tests/components/debug/test.esp32-s2-idf.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<<: !include common.yaml
-
-sensor:
-  - platform: debug
-    fragmentation:
-      name: "Heap Fragmentation"
-    min_free:
-      name: "Heap Min Free"
diff --git a/tests/components/debug/test.esp8266-ard.yaml b/tests/components/debug/test.esp8266-ard.yaml
index 1398087bf0..da54acfc0d 100644
--- a/tests/components/debug/test.esp8266-ard.yaml
+++ b/tests/components/debug/test.esp8266-ard.yaml
@@ -1,4 +1,5 @@
-<<: !include common.yaml
+packages:
+  debug: !include common.yaml
 
 sensor:
   - platform: debug
diff --git a/tests/components/debug/test.host.yaml b/tests/components/debug/test.host.yaml
index dade44d145..25c05c6f81 100644
--- a/tests/components/debug/test.host.yaml
+++ b/tests/components/debug/test.host.yaml
@@ -1 +1,2 @@
-<<: !include common.yaml
+packages:
+  debug: !include common.yaml
diff --git a/tests/components/debug/test.ln882x-ard.yaml b/tests/components/debug/test.ln882x-ard.yaml
deleted file mode 100644
index fdae374788..0000000000
--- a/tests/components/debug/test.ln882x-ard.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<<: !include common.yaml
-
-sensor:
-  - platform: debug
-    min_free:
-      name: "Heap Min Free"
diff --git a/tests/components/debug/test.nrf52-adafruit.yaml b/tests/components/debug/test.nrf52-adafruit.yaml
index 6a446634af..53eea184f5 100644
--- a/tests/components/debug/test.nrf52-adafruit.yaml
+++ b/tests/components/debug/test.nrf52-adafruit.yaml
@@ -1,4 +1,5 @@
-<<: !include common.yaml
+packages:
+  debug: !include common.yaml
 
 nrf52:
   reg0:
diff --git a/tests/components/debug/test.nrf52-mcumgr.yaml b/tests/components/debug/test.nrf52-mcumgr.yaml
index dade44d145..25c05c6f81 100644
--- a/tests/components/debug/test.nrf52-mcumgr.yaml
+++ b/tests/components/debug/test.nrf52-mcumgr.yaml
@@ -1 +1,2 @@
-<<: !include common.yaml
+packages:
+  debug: !include common.yaml
diff --git a/tests/components/debug/test.nrf52-xiao-ble.yaml b/tests/components/debug/test.nrf52-xiao-ble.yaml
deleted file mode 100644
index dade44d145..0000000000
--- a/tests/components/debug/test.nrf52-xiao-ble.yaml
+++ /dev/null
@@ -1 +0,0 @@
-<<: !include common.yaml
diff --git a/tests/components/debug/test.rp2040-ard.yaml b/tests/components/debug/test.rp2040-ard.yaml
index dade44d145..25c05c6f81 100644
--- a/tests/components/debug/test.rp2040-ard.yaml
+++ b/tests/components/debug/test.rp2040-ard.yaml
@@ -1 +1,2 @@
-<<: !include common.yaml
+packages:
+  debug: !include common.yaml
diff --git a/tests/components/debug/test.rtl87xx-ard.yaml b/tests/components/debug/test.rtl87xx-ard.yaml
deleted file mode 100644
index fdae374788..0000000000
--- a/tests/components/debug/test.rtl87xx-ard.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-<<: !include common.yaml
-
-sensor:
-  - platform: debug
-    min_free:
-      name: "Heap Min Free"