config: pipeline: Limit target trees/branches for Chromebook tests

Currently, most tests on Chromebooks run across all available tree/branch combinations. Restrict these tests to stable-rc and mainline trees to simplify monitoring while still identifying relevant regressions. Signed-off-by: Laura Nao <[email protected]>
kernelci · Jan 8, 2025 · e4e88c2 · e4e88c2
1 parent 4e24dc8
commit e4e88c2
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 20 deletions.
diff --git a/config/jobs-chromeos.yaml b/config/jobs-chromeos.yaml
@@ -491,6 +491,10 @@ _anchors:
       test_method: watchdog-reset
       bl_message: 'coreboot-'
       wdt_dev: 'watchdog0'
+    rules:
+      tree:
+        - mainline
+        - stable-rc
     kcidb_test_suite: kernelci_watchdog_reset
 
   wifi-basic: &wifi-basic-job
@@ -503,32 +507,40 @@ _anchors:
     rules:
       tree:
         - mainline
-        - next
+        - stable-rc
     kcidb_test_suite: kernelci_wifi_basic
 
 jobs:
 
-  baseline-arm64-mediatek: &baseline-job
+  baseline-arm64-mediatek: &baseline-chromebook-job
     template: baseline.jinja2
     kind: job
     kcidb_test_suite: boot
+    rules:
+      tree:
+        - mainline
+        - stable-rc
 
-  baseline-arm64-qualcomm: *baseline-job
+  baseline-arm64-qualcomm: *baseline-chromebook-job
 
-  baseline-nfs-arm64-mediatek: &baseline-nfs-job
+  baseline-nfs-arm64-mediatek: &baseline-nfs-chromebook-job
     template: baseline.jinja2
     kind: job
     params:
       boot_commands: nfs
       nfsroot: http://storage.kernelci.org/images/rootfs/debian/bookworm/20240313.0/{debarch}
     kcidb_test_suite: boot.nfs
+    rules:
+      tree:
+        - mainline
+        - stable-rc
 
-  baseline-nfs-arm64-qualcomm: *baseline-nfs-job
-  baseline-nfs-x86-amd: *baseline-nfs-job
-  baseline-nfs-x86-intel: *baseline-nfs-job
-  baseline-x86-amd: *baseline-job
-  baseline-x86-amd-staging: *baseline-job
-  baseline-x86-intel: *baseline-job
+  baseline-nfs-arm64-qualcomm: *baseline-nfs-chromebook-job
+  baseline-nfs-x86-amd: *baseline-nfs-chromebook-job
+  baseline-nfs-x86-intel: *baseline-nfs-chromebook-job
+  baseline-x86-amd: *baseline-chromebook-job
+  baseline-x86-amd-staging: *baseline-chromebook-job
+  baseline-x86-intel: *baseline-chromebook-job
 
   kbuild-gcc-12-arm64-chromebook:
     <<: *kbuild-gcc-12-arm64-chromeos-job

diff --git a/config/pipeline.yaml b/config/pipeline.yaml
@@ -1518,9 +1518,10 @@ jobs:
       nfsroot: 'http://storage.kernelci.org/images/rootfs/debian/bookworm-kselftest/20241007.0/{debarch}'
       collections: cpufreq
       job_timeout: 10
-    rules:
+    rules: &kselftest-rules
       tree:
-      - '!android'
+        - mainline
+        - stable-rc
     kcidb_test_suite: kselftest.cpufreq
 
   kselftest-cpufreq-hibernate:
@@ -1530,8 +1531,10 @@ jobs:
       collections: cpufreq
       env: 'KSELFTEST_MAIN_SH_ARGS="-t hibernate_rtc"'
     rules:
-      tree:
-      - 'kernelci:staging-next'
+      <<: *kselftest-rules
+      min_version:
+        version: 6
+        patchlevel: 12
     kcidb_test_suite: kselftest.cpufreq.hibernate
 
   kselftest-cpufreq-suspend:
@@ -1541,8 +1544,10 @@ jobs:
       collections: cpufreq
       env: 'KSELFTEST_MAIN_SH_ARGS="-t suspend_rtc"'
     rules:
-      tree:
-      - 'kernelci:staging-next'
+      <<: *kselftest-rules
+      min_version:
+        version: 6
+        patchlevel: 12
     kcidb_test_suite: kselftest.cpufreq.suspend
 
   kselftest-devices-exist:
@@ -1564,8 +1569,7 @@ jobs:
       collections: devices/probe
       env: "KSELFTEST_TEST_DISCOVERABLE_DEVICES_PY_ARGS=--boards-dir=/opt/platform-test-parameters/kselftest/test_discoverable_devices/boards/"
     rules:
-      tree:
-      - '!android'
+      <<: *kselftest-rules
       min_version:
         version: 6
         patchlevel: 11
@@ -1584,8 +1588,7 @@ jobs:
       <<: *kselftest-params
       collections: dt
     rules:
-      tree:
-      - '!android'
+      <<: *kselftest-rules
       min_version:
         version: 6
         patchlevel: 7