Merge ~liaou3/checkbox-iiotg/+git/checkbox-provider-intliotg:replace_powermanagement_jobs_with_ppc into ~checkbox-dev/checkbox-iiotg/+git/checkbox-provider-intliotg:master

[Vincent Liao]

Modify: Replace current power-management-cpu-cstate jobs with checkbox ppc jobs

Currently we have power-management-cpu-cstate jobs in checkbox base provider, so there's no need for us to create our own jobs in checkbox-iiotg provider.
Submission: https://certification.canonical.com/hardware/202212-30958/submission/339813/

[Rick Wu (rickwu4444)]

@Vicent, What's the reason that we don't need after-suspend any more?

[Rick Wu (rickwu4444)]

LGTM

review: Approve

[Vincent Liao (liaou3)]

> @Vicent, What's the reason that we don't need after-suspend any more?
Since those tests are to check the performance under c state which is an idle statement, there's no need for `after-suspend` And it's also why in checkbox ppc provider [1] we don't have the `after-suspend` test for these.

[1] https://github.com/canonical/checkbox/blob/40d2f3f56adbe570f1ce816a88203a39737061ed/providers/base/units/power-management/test-plan.pxu#L114

[Vic Liu (zongminl)]

review: Needs Information

[Vic Liu (zongminl)]

LGTM, thank you.

review: Approve

diff --git a/bin/screenoff.sh b/bin/screenoff.sh
deleted file mode 100755
index 2ca3a36..0000000
--- a/bin/screenoff.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-while read -r line;
-do
-    if [ "${line:0:7}" = "N: Name" ]; then
-        name="${line:9:-1}"
-    fi
-    if [ "${line:0:8}" = "S: Sysfs" ] && [ "$keyboard" -eq 1 ]; then
-        sysfs="${line:9}"
-	break
-    fi
-    if [ "$name" = "AT Translated Set 2 keyboard" ] ||
-       [ "${name:0:26}" = "Logitech Wireless Keyboard" ]; then
-        keyboard=1
-    else
-        keyboard=0
-    fi
-done </proc/bus/input/devices
-
-event_sysfs=$(find "/sys$sysfs" -name "event*")
-event_idx=$(echo "$event_sysfs" | awk -F/ '{print $NF}')
-device="/dev/input/$event_idx"
-
-evemu-event "${device}" --type EV_MSC --code MSC_SCAN --value 219
-evemu-event --sync "${device}" --type EV_KEY --code KEY_LEFTMETA --value 1
-evemu-event "${device}" --type EV_MSC --code MSC_SCAN --value 38
-evemu-event --sync "${device}" --type EV_KEY --code KEY_L --value 1
-evemu-event "${device}" --type EV_MSC --code MSC_SCAN --value 38
-evemu-event --sync "${device}" --type EV_KEY --code KEY_L --value 0
-evemu-event "${device}" --type EV_MSC --code MSC_SCAN --value 219
-evemu-event --sync "${device}" --type EV_KEY --code KEY_LEFTMETA --value 0
-sleep "$1"
-evemu-event "${device}" --type EV_MSC --code MSC_SCAN --value 28
-evemu-event --sync "${device}" --type EV_KEY --code KEY_ENTER --value 1
-evemu-event "${device}" --type EV_MSC --code MSC_SCAN --value 28
-evemu-event --sync "${device}" --type EV_KEY --code KEY_ENTER --value 0
-loginctl unlock-session
-
diff --git a/units/power-management-cpu-cstate/category.pxu b/units/power-management-cpu-cstate/category.pxu
deleted file mode 100644
index a2267af..0000000
--- a/units/power-management-cpu-cstate/category.pxu
+++ /dev/null
@@ -1,3 +0,0 @@
-unit: category
-id: power-management-cpu-cstate
-_name: Power Management CPU cstate
diff --git a/units/power-management-cpu-cstate/jobs.pxu b/units/power-management-cpu-cstate/jobs.pxu
deleted file mode 100644
index 88a6d1e..0000000
--- a/units/power-management-cpu-cstate/jobs.pxu
+++ /dev/null
@@ -1,124 +0,0 @@
-# tests originally copied from
-# https://git.launchpad.net/plainbox-provider-checkbox/tree/units/power-management/jobs.pxu
-#
-# Original tests:
-#    com.canonical.certification::power-management/idle-screen-on-residency-check
-#    com.canonical.certification::power-management/cpu-low-power-idle
-#    com.canonical.certification::power-management/system-low-power-idle
-
-id: power-management-cpu-cstate/idle-screen-on-residency-check
-category_id: power-management-cpu-cstate
-_summary: Test if CPU records time in desired low power C-state when idle
-_description:
- When the system has the screen on, but the CPU is idle, it should enter deeper idle state
- to reduce power consumption. The expected states are identified as PC8, PC9 and PC10.
- For more detail refer to https://01.org/blogs/qwang59/2020/linux-s0ix-troubleshooting
-unit: job
-plugin: shell
-imports:
- from com.canonical.certification import cpuinfo
- from com.canonical.certification import sleep
-requires:
- cpuinfo.type == 'GenuineIntel'
- sleep.mem_sleep == 's2idle'
-flags: also-after-suspend
-command:
- short-idle-check.sh -s 20
- RET=$?
- if [ $RET -ne 0 ]; then
-     echo "The CPU package target idle state residency is 0."
-     echo "It will consume more power when the system has the screen on, but the CPU is idle."
-     echo "More detail is in https://01.org/blogs/qwang59/2020/linux-s0ix-troubleshooting."
-     exit 1
- fi
-user: root
-estimated_duration: 22
-
-id: power-management-cpu-cstate/cpu-low-power-idle
-category_id: power-management-cpu-cstate
-_summary: CPU low power idle residency check
-_description:
- Check if CPU can achieve low power idle when screen off.
- For more detail, please refer to https://www.kernel.org/doc/html/latest/firmware-guide/acpi/lpit.html.
-unit: job
-plugin: shell
-imports:
- from com.canonical.certification import cpuinfo
- from com.canonical.certification import sleep
-requires:
- cpuinfo.cpu_lpi_file in ('low_power_idle_cpu_residency_us', 'package_cstate_show')
- sleep.mem_sleep == 's2idle'
-flags:  also-after-suspend
-command:
- cpu_lpi_file=$("$CHECKBOX_RUNTIME"/providers/checkbox-provider-resource/bin/cpuinfo_resource.py | grep cpu_lpi_file | awk '{ print $2 }')
- if [ "$cpu_lpi_file" == "low_power_idle_cpu_residency_us" ]; then
-     before=$(cat /sys/devices/system/cpu/cpuidle/low_power_idle_cpu_residency_us)
-     screenoff.sh 20
-     after=$(cat /sys/devices/system/cpu/cpuidle/low_power_idle_cpu_residency_us)
-     residency=$((after-before))
-     echo "/sys/devices/system/cpu/cpuidle/low_power_idle_cpu_residency_us after/before screen off is $residency"
- else
-     echo "The system doesn't have hardware-based residency counter."
-     echo "please check https://www.uefi.org/sites/default/files/resources/Intel_ACPI_Low_Power_S0_Idle.pdf"
-     before=$(cat < /sys/kernel/debug/pmc_core/package_cstate_show | grep C10 | awk '{ print $4 }')
-     screenoff.sh 20
-     after=$(cat < /sys/kernel/debug/pmc_core/package_cstate_show | grep C10 | awk '{ print $4 }')
-     residency=$((after-before))
-     echo "/sys/kernel/debug/pmc_core/package_cstate_show after/before screen off is $residency"
- fi
- if [ $residency -eq 0 ]; then
-     echo "The cpu can't enter low power idle when screen off."
-     echo "please refer to https://www.kernel.org/doc/html/latest/firmware-guide/acpi/lpit.html."
-     exit 1
- fi
-user: root
-estimated_duration: 25
-
-id: power-management-cpu-cstate/system-low-power-idle
-after: com.canonical.certification::suspend/suspend_advanced_auto
-category_id: power-management-cpu-cstate
-_summary: System low power idle residency check
-_description:
- Check if system can achieve low power idle in suspend.
- For more detail, plesae refer to https://www.kernel.org/doc/html/latest/firmware-guide/acpi/lpit.html.
-unit: job
-plugin: shell
-imports:
- from com.canonical.certification import cpuinfo
- from com.canonical.certification import sleep
-requires:
- cpuinfo.sys_lpi_file in ('low_power_idle_system_residency_us', 'slp_s0_residency_usec')
- sleep.mem_sleep == 's2idle'
-command:
- sys_lpi_file=$("$CHECKBOX_RUNTIME"/providers/checkbox-provider-resource/bin/cpuinfo_resource.py | grep sys_lpi_file | awk '{ print $2 }')
- echo "mem_sleep: $(cat /sys/power/mem_sleep)"
- dmesg | grep ACPI | grep supports | sed 's/\[.*ACPI/ACPI/'
- echo "Content of /etc/default/grub:"
- cat /etc/default/grub
- if [ "$sys_lpi_file" == "low_power_idle_system_residency_us" ]; then
-     before=$(cat /sys/devices/system/cpu/cpuidle/low_power_idle_system_residency_us)
-     rtcwake --mode freeze -s 10
-     after=$(cat /sys/devices/system/cpu/cpuidle/low_power_idle_system_residency_us)
-     residency=$((after-before))
-     echo "/sys/devices/system/cpu/cpuidle/low_power_idle_system_residency_us after/before suspend is $residency"
- else
-     echo "The system doesn't have hardware-based residency counter."
-     echo "please check https://www.uefi.org/sites/default/files/resources/Intel_ACPI_Low_Power_S0_Idle.pdf"
-     before=$(cat /sys/kernel/debug/pmc_core/slp_s0_residency_usec)
-     rtcwake --mode freeze -s 10
-     after=$(cat /sys/kernel/debug/pmc_core/slp_s0_residency_usec)
-     residency=$((after-before))
-     echo "/sys/kernel/debug/pmc_core/slp_s0_residency_usec after/before suspend is $residency"
- fi
- # shellcheck disable=SC2086
- if [ $residency -eq 0 ]; then
-     echo "The system can't enter s0 when suspended."
-     echo "please refer to https://www.kernel.org/doc/html/latest/firmware-guide/acpi/lpit.html."
-     if [ -f /sys/kernel/debug/suspend_stats ]; then
-         echo "cat /sys/kernel/debug/suspend_stats"
-         cat /sys/kernel/debug/suspend_stats
-     fi
-     exit 1
- fi
-user: root
-estimated_duration: 15
diff --git a/units/power-management-cpu-cstate/test-plan.pxu b/units/power-management-cpu-cstate/test-plan.pxu
deleted file mode 100644
index 9814220..0000000
--- a/units/power-management-cpu-cstate/test-plan.pxu
+++ /dev/null
@@ -1,44 +0,0 @@
-id: power-management-cpu-cstate-full
-_name: Power Management CPU cstate (Full)
-unit: test plan
-include:
-nested_part:
-    power-management-cpu-cstate-manual
-    power-management-cpu-cstate-automated
-
-id: after-suspend-power-management-cpu-cstate-full
-_name: After Suspend Power Management CPU cstate (Full)
-unit: test plan
-include:
-nested_part:
-    after-suspend-power-management-cpu-cstate-manual
-    after-suspend-power-management-cpu-cstate-automated
-
-id: power-management-cpu-cstate-manual
-_name: Power Management CPU cstate (Manual)
-unit: test plan
-include:
-nested_part:
-
-id: power-management-cpu-cstate-automated
-_name: Power Management CPU cstate (Automated)
-unit: test plan
-include:
-    power-management-cpu-cstate/idle-screen-on-residency-check
-    power-management-cpu-cstate/cpu-low-power-idle
-nested_part:
-
-id: after-suspend-power-management-cpu-cstate-manual
-_name: After Suspend Power Management CPU cstate (Manual)
-unit: test plan
-include:
-nested_part:
-
-id: after-suspend-power-management-cpu-cstate-automated
-_name: After Suspend Power Management CPU cstate (Automated)
-unit: test plan
-include:
-    power-management-cpu-cstate/system-low-power-idle
-    after-suspend-power-management-cpu-cstate/idle-screen-on-residency-check
-    after-suspend-power-management-cpu-cstate/cpu-low-power-idle
-nested_part:
diff --git a/units/test-plan-core.pxu b/units/test-plan-core.pxu
index 0cae768..955d16f 100644
--- a/units/test-plan-core.pxu
+++ b/units/test-plan-core.pxu
@@ -89,7 +89,6 @@ include:
 nested_part:
     device-connections-tp                                                      # must come first
     watchdog-intliotg-automated
-    power-management-cpu-cstate-automated
     qep-automated
     com.canonical.certification::edac-automated
     usb-dwc3-automated
@@ -98,7 +97,7 @@ nested_part:
     intel-mei-automated
     com.canonical.qa.ceoem::ce-oem-automated
     com.canonical.certification::client-cert-iot-ubuntucore-22-automated
-    after-suspend-power-management-cpu-cstate-automated
+    com.canonical.certification::power-management-cpu-cstate-cert-automated
     com.canonical.qa.ceoem::after-suspend-ce-oem-automated
 exclude:
     com.canonical.certification::tpm2.0_4.1.1/.*
@@ -118,7 +117,6 @@ include:
 nested_part:
     device-connections-tp                                                      # must come first
     watchdog-intliotg-automated
-    power-management-cpu-cstate-automated
     qep-automated
     com.canonical.certification::edac-automated
     usb-dwc3-automated
@@ -126,7 +124,7 @@ nested_part:
     thermal-automated
     intel-mei-automated
     com.canonical.certification::client-cert-iot-ubuntucore-20-automated
-    after-suspend-power-management-cpu-cstate-automated
+    com.canonical.certification::power-management-cpu-cstate-cert-automated
 exclude:
     com.canonical.certification::tpm2.0_4.1.1/.*
     com.canonical.certification::watchdog/.*
diff --git a/units/test-plan-desktop.pxu b/units/test-plan-desktop.pxu
index c1553e0..f6fd321 100644
--- a/units/test-plan-desktop.pxu
+++ b/units/test-plan-desktop.pxu
@@ -91,7 +91,6 @@ _description:
 include:
 nested_part:
     watchdog-intliotg-automated
-    power-management-cpu-cstate-automated
     qep-automated
     com.canonical.certification::edac-automated
     usb-dwc3-automated
@@ -101,7 +100,7 @@ nested_part:
     intel-mei-automated
     com.canonical.qa.ceoem::ce-oem-automated
     com.canonical.certification::client-cert-desktop-22-04-automated
-    after-suspend-power-management-cpu-cstate-automated
+    com.canonical.certification::power-management-cpu-cstate-cert-automated
     com.canonical.qa.ceoem::after-suspend-ce-oem-automated
 exclude:
     com.canonical.qa.ceoem::.*ce-oem-mtd.*
@@ -115,7 +114,6 @@ _description:
 include:
 nested_part:
     watchdog-intliotg-automated
-    power-management-cpu-cstate-automated
     qep-automated
     com.canonical.certification::edac-automated
     usb-dwc3-automated
@@ -124,7 +122,7 @@ nested_part:
     thermal-automated
     intel-mei-automated
     com.canonical.certification::client-cert-desktop-20-04-automated
-    after-suspend-power-management-cpu-cstate-automated
+    com.canonical.certification::power-management-cpu-cstate-cert-automated
 exclude:
     com.canonical.qa.ceoem::.*ce-oem-mtd.*
 
diff --git a/units/test-plan-server.pxu b/units/test-plan-server.pxu
index 87b8ef8..8226394 100644
--- a/units/test-plan-server.pxu
+++ b/units/test-plan-server.pxu
@@ -80,7 +80,6 @@ _description:
 include:
 nested_part:
     watchdog-intliotg-automated
-    power-management-cpu-cstate-automated
     qep-automated
     com.canonical.certification::edac-automated
     usb-dwc3-automated
@@ -89,7 +88,7 @@ nested_part:
     intel-mei-automated
     com.canonical.qa.ceoem::ce-oem-automated
     com.canonical.certification::client-cert-iot-server-22-04-automated
-    after-suspend-power-management-cpu-cstate-automated
+    com.canonical.certification::power-management-cpu-cstate-cert-automated
     com.canonical.qa.ceoem::after-suspend-ce-oem-automated
 exclude:
     com.canonical.certification::watchdog/.*
@@ -104,7 +103,6 @@ _description:
 include:
 nested_part:
     watchdog-intliotg-automated
-    power-management-cpu-cstate-automated
     qep-automated
     com.canonical.certification::edac-automated
     usb-dwc3-automated
@@ -112,7 +110,7 @@ nested_part:
     thermal-automated
     intel-mei-automated
     com.canonical.certification::client-cert-iot-server-20-04-automated
-    after-suspend-power-management-cpu-cstate-automated
+    com.canonical.certification::power-management-cpu-cstate-cert-automated
 exclude:
     com.canonical.certification::watchdog/.*
     com.canonical.qa.ceoem::.*ce-oem-mtd.*