Merge ~alextu/plainbox-provider-pc-sanity:move-turbostate-to-ppc-rc2 into plainbox-provider-pc-sanity:master

[Alex Tu]

[Kai-Chuan Hsieh (kchsieh)]

LGTM.

review: Approve

[Alex Tu (alextu)]

this 2 MPs is denepcy.
https://code.launchpad.net/~alextu/pc-enablement/+git/prepare-checkbox-sanity/+merge/399204
https://code.launchpad.net/~alextu/plainbox-provider-pc-sanity/+git/plainbox-provider-pc-sanity/+merge/399205

[Alex Tu (alextu)]

https://gitlab.com/alex-tu-cc/plainbox-provider-pc-sanity/-/pipelines/265928395

[Yuan-Chen Cheng (ycheng-twn)]

LGTM

review: Approve

diff --git a/units/pc-sanity/pc-sanity-power-consumption.pxu b/units/pc-sanity/pc-sanity-power-consumption.pxu
deleted file mode 100644
index f6d7716..0000000
--- a/units/pc-sanity/pc-sanity-power-consumption.pxu
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-plugin: shell
-category_id: com.canonical.plainbox::miscellanea
-id: miscellanea/turbostate-s2i-power-residency
-after: miscellanea/turbostate-long-idle-c10
-depends: power-management/cpu-low-power-idle
-user: root
-command:
- set -x
- check-turbostat-power-residency.sh --s2i
-_summary: check if expected power residency on s2i
-_description:
- check if target machine can get expected power residency on e.g. cpu pkg c10, s0ix, gfxrc6..etc
- this test case refer to Intel document : https://01.org/blogs/qwang59/2020/linux-s0ix-troubleshooting
-
-plugin: shell
-category_id: com.canonical.plainbox::miscellanea
-id: miscellanea/turbostate-short-idle-c10
-depends: power-management/cpu-low-power-idle
-command:
- set -x
- report_folder="$HOME/submission-report-$(date +%Y%m%d%H%M)"
- mkdir -p "$report_folder"
- dpkg -s linux-tools-"$(uname -r)" || sudo apt-get install -y linux-tools-"$(uname -r)"
- for i in $(sudo turbostat --list | sed 's/,/ /g'); do
-         if [ -z "${i##*pc*}" ]; then
-                 echo $i
-                 if [ -z "$COL" ]; then
-                         COL="$i";
-                 else
-                         COL="$COL,$i";
-                 fi
-         fi;
- done;
- sudo turbostat --num_iterations 20 --show "$COL" 2>&1 | tee "$report_folder"/turbostat-pkgpc-shortidle.log
- tail -n1 "$report_folder"/turbostat-pkgpc.log | grep "0.00$" && false
-_summary: check if target machine can get cpu pkg c10 in short idle.
-_description:
- check if target machine can get cpu pkg c10 in short idle. detail history: https://trello.com/c/3C0b5Nkt
-
-plugin: shell
-category_id: com.canonical.plainbox::miscellanea
-id: miscellanea/turbostate-long-idle-c10
-depends: power-management/cpu-low-power-idle
-command:
- set -x
- report_folder="$HOME/submission-report-$(date +%Y%m%d%H%M)"
- mkdir -p "$report_folder"
- dpkg -s linux-tools-"$(uname -r)" || sudo apt-get install -y linux-tools-"$(uname -r)" || exit 1
- dpkg -s xautomation || sudo apt-get install -y xautomation || exit 1
- gsettings set org.gnome.desktop.session idle-delay 10
- sleep 30
- for i in $(sudo turbostat --list | sed 's/,/ /g'); do
-         if [ -z "${i##*pc*}" ]; then
-                 echo $i
-                 if [ -z "$COL" ]; then
-                         COL="$i";
-                 else
-                         COL="$COL,$i";
-                 fi
-         fi;
- done;
- sudo turbostat --num_iterations 30 --show "$COL" 2>&1 | tee "$report_folder"/turbostat-pkgpc-longidle.log
- DISPLAY=:0 xte 'key Up'
- gsettings set org.gnome.desktop.session idle-delay 0
- # cat additional message for reference
- sudo cat /sys/kernel/debug/pmc_core/package_cstate_show
- # set false in the end when it failed so that test case be marked as failed.
- ! (tail -n1 "$report_folder"/turbostat-pkgpc-longidle.log | grep "0.00$")
-_summary: check if target machine can get cpu pkg c10 in long idle.
-_description:
- check if target machine can get cpu pkg c10 in long idle. detail history: https://trello.com/c/3C0b5Nkt
diff --git a/units/pc-sanity/pc-sanity.pxu b/units/pc-sanity/pc-sanity.pxu
index 2bc3739..91acf47 100644
--- a/units/pc-sanity/pc-sanity.pxu
+++ b/units/pc-sanity/pc-sanity.pxu
@@ -13,8 +13,12 @@ include:
     com.canonical.certification::miscellanea/cvescan
     com.canonical.certification::miscellanea/check-nvidia
     com.canonical.certification::miscellanea/debsums
-    com.canonical.certification::miscellanea/turbostate-long-idle-c10
-    com.canonical.certification::miscellanea/turbostate-s2i-power-residency
+    com.canonical.certification::power-management/check-turbostat-long-idle-cpu-residency
+    com.canonical.certification::power-management/check-turbostat-long-idle-s0ix-residency
+    com.canonical.certification::power-management/check-turbostat-long-idle-gfxrc6-residency
+    com.canonical.certification::power-management/check-turbostat-s2i-cpu-residency
+    com.canonical.certification::power-management/check-turbostat-s2i-s0ix-residency
+    com.canonical.certification::power-management/check-turbostat-s2i-gfxrc6-residency
     com.canonical.certification::miscellanea/intel-rapl
     com.canonical.certification::miscellanea/intel-rapl-mmio
     com.canonical.certification::miscellanea/intel-p-state
@@ -37,15 +41,6 @@ bootstrap_include:
     device
     graphics_card
 
-id: sleep-state-auto
-_name: sleep-state-auto (Ubuntu Desktop)
-unit: test plan
-_description:
-    This test plan collected all auto test related to sleep state.
-include:
-    com.canonical.certification::miscellanea/turbostate-long-idle-c10
-    com.canonical.certification::miscellanea/turbostate-s2i-power-residency
-
 id: graphics-dgpu-auto-switch-testing
 unit: test plan
 _name: A test plan to confirm dgpu auto switch works well.