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

[Vincent Liao]

Fix: Correct the path for cpuinfo_resource.py

This job use the cpuinfo_resource.py from checkbox ppc but didn't specify the path. This MR specify the path run it.
Submission: https://certification.canonical.com/hardware/202305-31589/submission/337419/

[Patrick Liu (patliu)]

Hi Vicent,

From the submission you provided, the "cpuinfo" resource job can be executed successfully.
The cpuinfo job uses cpuinfo_resources.py as well.

id: cpuinfo
estimated_duration: 0.37
plugin: resource
user: root
command: cpuinfo_resource.py
_summary: Collect information about the CPU
_description: Gets CPU resource info from /proc/cpuinfo

So I'm wondering why we need to specify the whole path in this job.

review: Needs Information

[Vincent Liao (liaou3)]

> Hi Vicent,
>
> From the submission you provided, the "cpuinfo" resource job can be executed
> successfully.
> The cpuinfo job uses cpuinfo_resources.py as well.
>
> id: cpuinfo
> estimated_duration: 0.37
> plugin: resource
> user: root
> command: cpuinfo_resource.py
> _summary: Collect information about the CPU
> _description: Gets CPU resource info from /proc/cpuinfo
>
> So I'm wondering why we need to specify the whole path in this job.

Because in the iiotg job `power-management-cpu-cstate/cpu-low-power-idle`, we will call the `cpuinfo_resource.py` from checkbox ppc provider which is not in the current checkbox-provider-iiotg. That's why we need to specify the path.

[Patrick Liu (patliu)]

LGTM

review: Approve

[StanleyHuang (stanley31)]

LGTM

review: Approve

diff --git a/units/power-management-cpu-cstate/jobs.pxu b/units/power-management-cpu-cstate/jobs.pxu
index b7c0672..88a6d1e 100644
--- a/units/power-management-cpu-cstate/jobs.pxu
+++ b/units/power-management-cpu-cstate/jobs.pxu
@@ -50,7 +50,7 @@ requires:
  sleep.mem_sleep == 's2idle'
 flags:  also-after-suspend
 command:
- cpu_lpi_file=$(cpuinfo_resource.py | grep cpu_lpi_file | awk '{ print $2 }')
+ 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
@@ -90,7 +90,7 @@ requires:
  cpuinfo.sys_lpi_file in ('low_power_idle_system_residency_us', 'slp_s0_residency_usec')
  sleep.mem_sleep == 's2idle'
 command:
- sys_lpi_file=$(cpuinfo_resource.py | grep sys_lpi_file | awk '{ print $2 }')
+ 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:"