scheduler: add tree-based priority for LAVA jobs

bhcopeland · nuclearcat · commit 8dfdd955c3e4 · 2026-01-15T07:59:44.000Z
Add tree priority lookup using string values (high/medium/low) instead
of numeric priorities. Tree priorities are read from build configs and
passed to LAVA runtime via node data.

Priority assignments:
- high: mainline, stable, stable-rc
- medium: next, stable-rt, kselftest
- low: android, cip, kernelci (default)

Human submissions always get highest priority for bisection/debugging.

Signed-off-by: Ben Copeland &lt;ben.copeland@linaro.org&gt;
diff --git a/config/jobs.yaml b/config/jobs.yaml
@@ -11,13 +11,15 @@ _anchors:
   baseline-job: &baseline-job
     template: baseline.jinja2
     kind: job
+    priority: medium
     kcidb_test_suite: boot
     params:
       ramdisk: 'http://storage.kernelci.org/images/rootfs/buildroot/buildroot-baseline/20230703.0/{brarch}/rootfs.cpio.gz'
 
   baseline-nfs-job: &baseline-nfs-job
     template: baseline-nfs.jinja2
     kind: job
+    priority: medium
     kcidb_test_suite: boot.nfs
     params:
       boot_commands: nfs
@@ -26,6 +28,7 @@ _anchors:
   kbuild-job: &kbuild-job
     template: kbuild.jinja2
     kind: kbuild
+    priority: high
     rules:
       tree:
       - '!android'
@@ -87,6 +90,7 @@ _anchors:
   kvm-unit-tests-job: &kvm-unit-tests-job
     template: kvm-unit-tests.jinja2
     kind: job
+    priority: low
     params: &kvm-unit-tests-params
       boot_commands: nfs
       nfsroot: 'https://storage.kernelci.org/images/rootfs/debian/bookworm-kvm-unit-tests/20250624.0/{debarch}'
@@ -98,6 +102,7 @@ _anchors:
   ltp-job: &ltp-job
     template: ltp.jinja2
     kind: job
+    priority: low
     params: &ltp-params
       boot_commands: nfs
       nfsroot: 'https://storage.kernelci.org/images/rootfs/debian/trixie-ltp/20251201.0/{debarch}'
@@ -1572,6 +1577,7 @@ jobs:
   kselftest-aaa: &kselftest-job
     template: generic.jinja2
     kind: job
+    priority: medium
     params: &kselftest-params
       test_method: kselftest
       boot_commands: nfs
@@ -1588,6 +1594,7 @@ jobs:
   kselftest-aaa-ramdisk: &kselftest-job-ramdisk
     template: generic.jinja2
     kind: job
+    priority: medium
     params: &kselftest-params-ramdisk
       test_method: kselftest
       boot_commands: ramdisk
@@ -2151,6 +2158,7 @@ jobs:
   kunit: &kunit-job
     template: kunit.jinja2
     kind: job
+    priority: medium
     image: ghcr.io/kernelci/{image_prefix}gcc-14:x86-kunit-kernelci
     kcidb_test_suite: kunit
     rules:
@@ -2375,6 +2383,7 @@ jobs:
   rt-tests: &rt-tests
     template: rt-tests.jinja2
     kind: job
+    priority: low
     params: &rt-tests-params
       boot_commands: nfs
       nfsroot: 'https://storage.kernelci.org/images/rootfs/debian/bookworm-rt/20240806.0/{debarch}'
diff --git a/config/trees/android.yaml b/config/trees/android.yaml
@@ -2,6 +2,7 @@ build_configs:
   android_mainline: &android
     tree: android
     branch: 'android-mainline'
+    priority: low
     architectures:
       - x86_64
       - i386
diff --git a/config/trees/cip.yaml b/config/trees/cip.yaml
@@ -2,6 +2,7 @@ build_configs:
   cip: &cip
     tree: cip
     branch: 'master'
+    priority: low
     architectures:
       - arm
       - arm64
diff --git a/config/trees/kernelci.yaml b/config/trees/kernelci.yaml
@@ -2,6 +2,7 @@ build_configs:
   kernelci_staging-mainline: &kernelci
     tree: kernelci
     branch: 'staging-mainline'
+    priority: low
     architectures:
       - x86_64
       - arm64
diff --git a/config/trees/kselftest.yaml b/config/trees/kselftest.yaml
@@ -2,6 +2,7 @@ build_configs:
   kselftest_fixes: &kselftest
     tree: kselftest
     branch: 'fixes'
+    priority: medium
 
   kselftest_next:
     <<: *kselftest
diff --git a/config/trees/mainline.yaml b/config/trees/mainline.yaml
@@ -2,3 +2,4 @@ build_configs:
   mainline:
     tree: mainline
     branch: 'master'
+    priority: high
diff --git a/config/trees/next.yaml b/config/trees/next.yaml
@@ -2,6 +2,7 @@ build_configs:
   next_master: &next
     tree: next
     branch: 'master'
+    priority: medium
 
   next_pending-fixes:
     <<: *next
diff --git a/config/trees/stable-rc.yaml b/config/trees/stable-rc.yaml
@@ -2,6 +2,7 @@ build_configs:
   stable-rc_5.10: &stable-rc
     tree: stable-rc
     branch: 'linux-5.10.y'
+    priority: high
 
   stable-rc_5.15:
     <<: *stable-rc
diff --git a/config/trees/stable-rt.yaml b/config/trees/stable-rt.yaml
@@ -2,6 +2,7 @@ build_configs:
   stable-rt_v4.14-rt: &stable-rt
     tree: stable-rt
     branch: 'v4.14-rt'
+    priority: medium
 
   stable-rt_v4.14-rt-next:
     <<: *stable-rt
diff --git a/config/trees/stable.yaml b/config/trees/stable.yaml
@@ -2,6 +2,7 @@ build_configs:
   stable_5.4: &stable
     tree: stable
     branch: 'linux-5.4.y'
+    priority: high
 
   stable_5.10:
     <<: *stable
diff --git a/src/scheduler.py b/src/scheduler.py
@@ -101,8 +101,8 @@ def __init__(self, configs, args):
         self._verbose = args.verbose
         self._output = args.output
         self._imgprefix = args.image_prefix or ''
-        # Store raw YAML data for fragment resolution
         self._raw_yaml = configs.get('_raw_yaml', {})
+        self._build_configs = configs.get('build_configs', {})
         if not os.path.exists(self._output):
             os.makedirs(self._output)
         self._job_tmp_dirs = {}
@@ -418,6 +418,17 @@ def _should_skip_due_to_queue_depth(self, runtime, job_config, platform):
             )
             return False  # Fail-open: don't skip on errors
 
+    def _get_tree_priority(self, tree_name, branch_name):
+        for build_config in self._build_configs.values():
+            if (build_config.tree.name == tree_name and
+                    build_config.branch == branch_name):
+                priority = build_config.priority
+                if priority is not None:
+                    self.log.debug(f"Tree priority for {tree_name}/{branch_name}: {priority}")
+                return priority
+        self.log.debug(f"No build config found for {tree_name}/{branch_name}")
+        return None
+
     def _run_job(self, job_config, runtime, platform, input_node, retry_counter):
         try:
             node = self._api_helper.create_job_node(
@@ -441,6 +452,15 @@ def _run_job(self, job_config, runtime, platform, input_node, retry_counter):
         if not node:
             return
         self.log.debug(f"Job node created: {node['id']}. Parent: {node['parent']}")
+
+        kernel_rev = node['data'].get('kernel_revision', {})
+        tree_name = kernel_rev.get('tree')
+        branch_name = kernel_rev.get('branch')
+        if tree_name and branch_name:
+            tree_priority = self._get_tree_priority(tree_name, branch_name)
+            if tree_priority is not None:
+                node['data']['tree_priority'] = tree_priority
+
         # Most of the time, the artifacts we need originate from the parent
         # node. Import those into the current node, working on a copy so the
         # original node doesn't get "polluted" with useless artifacts when we
diff --git a/tests/test_scheduler.py b/tests/test_scheduler.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+
+import unittest
+from unittest.mock import MagicMock
+from src.scheduler import Scheduler
+
+
+class TestSchedulerTreePriority(unittest.TestCase):
+    """Test tree priority lookup in scheduler"""
+
+    def test_get_tree_priority_found(self):
+        """Test _get_tree_priority returns correct priority when tree/branch match"""
+        scheduler = MagicMock(spec=Scheduler)
+
+        tree_mock = MagicMock()
+        tree_mock.name = 'mainline'
+
+        build_config_mock = MagicMock()
+        build_config_mock.tree = tree_mock
+        build_config_mock.branch = 'master'
+        build_config_mock.priority = 'high'
+
+        scheduler._build_configs = {'mainline': build_config_mock}
+
+        result = Scheduler._get_tree_priority(scheduler, 'mainline', 'master')
+        self.assertEqual(result, 'high')
+
+    def test_get_tree_priority_not_found(self):
+        """Test _get_tree_priority returns None when tree/branch not found"""
+        scheduler = MagicMock(spec=Scheduler)
+
+        tree_mock = MagicMock()
+        tree_mock.name = 'mainline'
+
+        build_config_mock = MagicMock()
+        build_config_mock.tree = tree_mock
+        build_config_mock.branch = 'master'
+        build_config_mock.priority = 'high'
+
+        scheduler._build_configs = {'mainline': build_config_mock}
+
+        result = Scheduler._get_tree_priority(scheduler, 'nonexistent', 'branch')
+        self.assertIsNone(result)
+
+    def test_get_tree_priority_none_value(self):
+        """Test _get_tree_priority returns None when priority is None"""
+        scheduler = MagicMock(spec=Scheduler)
+
+        tree_mock = MagicMock()
+        tree_mock.name = 'stable'
+
+        build_config_mock = MagicMock()
+        build_config_mock.tree = tree_mock
+        build_config_mock.branch = 'linux-6.6.y'
+        build_config_mock.priority = None
+
+        scheduler._build_configs = {'stable': build_config_mock}
+
+        result = Scheduler._get_tree_priority(scheduler, 'stable', 'linux-6.6.y')
+        self.assertIsNone(result)
+
+
+if __name__ == '__main__':
+    unittest.main()
