From 0f17492d34c236b7ea2fea2d69b46d3140e989af Mon Sep 17 00:00:00 2001
From: Philip Li <philip.li@intel.com>
Date: Sat, 12 Oct 2024 13:34:40 +0800
Subject: [PATCH] jobs/lkvs*: consolidate yamls

Signed-off-by: Philip Li <philip.li@intel.com>
---
 jobs/lkvs-server.yaml | 15 +++++++++++++++
 jobs/lkvs.yaml        |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/jobs/lkvs-server.yaml b/jobs/lkvs-server.yaml
index 6a2030aa6..ec7d8ab78 100644
--- a/jobs/lkvs-server.yaml
+++ b/jobs/lkvs-server.yaml
@@ -5,3 +5,18 @@ category: functional
 lkvs:
   test:
     - topology-server
+
+---
+lkvs:
+  test: cstate-server # require GNR and above
+
+perf-stat:
+
+timeout: 1h
+
+---
+lkvs:
+  test:
+    - rapl-server # require GNR and above
+
+timeout: 1h
diff --git a/jobs/lkvs.yaml b/jobs/lkvs.yaml
index f5c0a888b..dde06fa12 100644
--- a/jobs/lkvs.yaml
+++ b/jobs/lkvs.yaml
@@ -22,6 +22,7 @@ lkvs:
     - pstate
     - pt
     - sdsi
+    - splitlock # require SPR and above
     - tdx-compliance
     - tdx-guest
     # - tdx-osv-sanity
@@ -33,3 +34,4 @@ lkvs:
     - umip
     - workload-xsave
     - xsave
+    - ufs # require GNR and above