Drop the CI test timeout back down to 120 seconds. (#20870)

Multi-minute YAML tests should not be running per-push in CI.
project-chip · Jul 18, 2022 · 5b93d57 · 5b93d57
1 parent 953abf5
commit 5b93d57
Show file tree

Hide file tree

Showing 5 changed files with 833 additions and 1,984 deletions.
diff --git a/.github/workflows/darwin-tests.yaml b/.github/workflows/darwin-tests.yaml
@@ -105,7 +105,7 @@ jobs:
                      --target-skip-glob '{TestGroupMessaging}' \
                      run \
                      --iterations 1 \
-                     --test-timeout-seconds 200 \
+                     --test-timeout-seconds 120 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
                      --lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \
                      --ota-provider-app ./out/darwin-x64-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -97,7 +97,7 @@ jobs:
                      --chip-tool ./out/linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT}/chip-tool \
                      run \
                      --iterations 1 \
-                     --test-timeout-seconds 200 \
+                     --test-timeout-seconds 120 \
                      --all-clusters-app ./out/linux-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
                      --lock-app ./out/linux-x64-lock-${BUILD_VARIANT}/chip-lock-app \
                      --ota-provider-app ./out/linux-x64-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \
@@ -199,7 +199,7 @@ jobs:
                      --target-skip-glob '{TestGroupMessaging,Test_TC_DGTHREAD_2_1,Test_TC_DGTHREAD_2_2,Test_TC_DGTHREAD_2_3,Test_TC_DGTHREAD_2_4}' \
                      run \
                      --iterations 1 \
-                     --test-timeout-seconds 200 \
+                     --test-timeout-seconds 120 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
                      --lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \
                      --ota-provider-app ./out/darwin-x64-ota-provider-${BUILD_VARIANT}/chip-ota-provider-app \

diff --git a/src/app/tests/suites/tests.js b/src/app/tests/suites/tests.js
@@ -247,6 +247,8 @@ function getManualTests() {
         "Test_TC_CADMIN_1_23",
         "Test_TC_CADMIN_1_24",
         // Slow tests that should not run in CI because they take many minutes each
+        "Test_TC_CADMIN_1_3",
+        "Test_TC_CADMIN_1_4",
         "Test_TC_CADMIN_1_5",
         "Test_TC_CADMIN_1_6",
         "Test_TC_CADMIN_1_9",
@@ -703,8 +705,6 @@ function getTests() {
     ];
 
     const MultipleFabrics = [
-        "Test_TC_CADMIN_1_3",
-        "Test_TC_CADMIN_1_4",
     ];
 
     const OTASoftwareUpdate = [