From 243551e585b5ef3ef1d69cc5e08bca959f233d4f Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Fri, 10 Oct 2025 06:55:25 -1000
Subject: [PATCH] adj

---
 .github/workflows/ci.yml                                 | 6 +++---
 script/split_components_for_ci.py                        | 6 +++---
 tests/components/mipi_dsi/test.esp32-p4-idf.yaml         | 9 +++------
 tests/components/modbus_controller/common.yaml           | 5 ++---
 .../components/modbus_controller/test.esp32-c3-idf.yaml  | 5 +----
 tests/components/modbus_controller/test.esp32-idf.yaml   | 5 +----
 tests/components/modbus_controller/test.esp8266-ard.yaml | 5 +----
 tests/components/modbus_controller/test.rp2040-ard.yaml  | 5 +----
 8 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 172c3113a2..cbd5e8fc2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -392,7 +392,7 @@ jobs:
           python3 script/test_build_components.py -e compile -c ${{ matrix.file }}
 
   test-build-components-splitter:
-    name: Split components for intelligent grouping (10 per batch)
+    name: Split components for intelligent grouping (15 per batch)
     runs-on: ubuntu-24.04
     needs:
       - common
@@ -417,12 +417,12 @@ jobs:
           components='${{ needs.determine-jobs.outputs.changed-components }}'
 
           echo "Splitting components intelligently..."
-          output=$(python3 script/split_components_for_ci.py --components "$components" --batch-size 10 --output github)
+          output=$(python3 script/split_components_for_ci.py --components "$components" --batch-size 15 --output github)
 
           echo "$output" >> $GITHUB_OUTPUT
 
   test-build-components-split:
-    name: Test components with intelligent grouping
+    name: Test components batch (${{ matrix.components }})
     runs-on: ubuntu-24.04
     needs:
       - common
diff --git a/script/split_components_for_ci.py b/script/split_components_for_ci.py
index 184c05eae0..019d482b6e 100755
--- a/script/split_components_for_ci.py
+++ b/script/split_components_for_ci.py
@@ -49,7 +49,7 @@ def has_test_files(component_name: str, tests_dir: Path) -> bool:
 def create_intelligent_batches(
     components: list[str],
     tests_dir: Path,
-    batch_size: int = 10,
+    batch_size: int = 15,
 ) -> list[list[str]]:
     """Create batches optimized for component grouping.
 
@@ -161,8 +161,8 @@ def main() -> int:
         "--batch-size",
         "-b",
         type=int,
-        default=10,
-        help="Target batch size (default: 10)",
+        default=15,
+        help="Target batch size (default: 15)",
     )
     parser.add_argument(
         "--tests-dir",
diff --git a/tests/components/mipi_dsi/test.esp32-p4-idf.yaml b/tests/components/mipi_dsi/test.esp32-p4-idf.yaml
index 9c4eb07d9b..770b11d089 100644
--- a/tests/components/mipi_dsi/test.esp32-p4-idf.yaml
+++ b/tests/components/mipi_dsi/test.esp32-p4-idf.yaml
@@ -1,3 +1,6 @@
+packages:
+  i2c: !include ../../test_build_components/common/i2c/esp32-p4-idf.yaml
+
 esp_ldo:
   - id: ldo_id
     channel: 3
@@ -13,9 +16,3 @@ display:
     #id: backlight_id
 
 psram:
-
-i2c:
-  sda: GPIO7
-  scl: GPIO8
-  scan: true
-  frequency: 400kHz
diff --git a/tests/components/modbus_controller/common.yaml b/tests/components/modbus_controller/common.yaml
index 1a7f67a0ef..ae5520e57d 100644
--- a/tests/components/modbus_controller/common.yaml
+++ b/tests/components/modbus_controller/common.yaml
@@ -1,13 +1,12 @@
 modbus:
-  - id: mod_bus1
-    flow_control_pin: ${flow_control_pin}
   - id: mod_bus2
+    uart_id: uart_bus
     role: server
 
 modbus_controller:
   - id: modbus_controller1
     address: 0x2
-    modbus_id: mod_bus1
+    modbus_id: modbus_bus
     allow_duplicate_commands: false
     on_online:
       then:
diff --git a/tests/components/modbus_controller/test.esp32-c3-idf.yaml b/tests/components/modbus_controller/test.esp32-c3-idf.yaml
index 4ebb4fe541..db826676ee 100644
--- a/tests/components/modbus_controller/test.esp32-c3-idf.yaml
+++ b/tests/components/modbus_controller/test.esp32-c3-idf.yaml
@@ -1,7 +1,4 @@
-substitutions:
-  flow_control_pin: GPIO3
-
 packages:
-  uart: !include ../../test_build_components/common/uart/esp32-c3-idf.yaml
+  modbus: !include ../../test_build_components/common/modbus/esp32-c3-idf.yaml
 
 <<: !include common.yaml
diff --git a/tests/components/modbus_controller/test.esp32-idf.yaml b/tests/components/modbus_controller/test.esp32-idf.yaml
index fb31792ee2..ace2d95a0b 100644
--- a/tests/components/modbus_controller/test.esp32-idf.yaml
+++ b/tests/components/modbus_controller/test.esp32-idf.yaml
@@ -1,7 +1,4 @@
-substitutions:
-  flow_control_pin: GPIO13
-
 packages:
-  uart: !include ../../test_build_components/common/uart/esp32-idf.yaml
+  modbus: !include ../../test_build_components/common/modbus/esp32-idf.yaml
 
 <<: !include common.yaml
diff --git a/tests/components/modbus_controller/test.esp8266-ard.yaml b/tests/components/modbus_controller/test.esp8266-ard.yaml
index 36079f3c03..560629b0cd 100644
--- a/tests/components/modbus_controller/test.esp8266-ard.yaml
+++ b/tests/components/modbus_controller/test.esp8266-ard.yaml
@@ -1,7 +1,4 @@
-substitutions:
-  flow_control_pin: GPIO15
-
 packages:
-  uart: !include ../../test_build_components/common/uart/esp8266-ard.yaml
+  modbus: !include ../../test_build_components/common/modbus/esp8266-ard.yaml
 
 <<: !include common.yaml
diff --git a/tests/components/modbus_controller/test.rp2040-ard.yaml b/tests/components/modbus_controller/test.rp2040-ard.yaml
index 2a1c7c97af..eeebbd2a8a 100644
--- a/tests/components/modbus_controller/test.rp2040-ard.yaml
+++ b/tests/components/modbus_controller/test.rp2040-ard.yaml
@@ -1,7 +1,4 @@
-substitutions:
-  flow_control_pin: GPIO6
-
 packages:
-  uart: !include ../../test_build_components/common/uart/rp2040-ard.yaml
+  modbus: !include ../../test_build_components/common/modbus/rp2040-ard.yaml
 
 <<: !include common.yaml