Merge ~kissiel/checkbox-provider-phoronix:stricter-approach into checkbox-provider-phoronix:master

[Maciej Kisielewski]

* make PTS require the cache, so it never installs the tests
* don't run on anything else than x86_64 (for now)

[Paul Larson (pwlars)]

lgtm, +1

review: Approve

[Sylvain Pineau (sylvain-pineau)]

+1

review: Approve

[Devices Certification Bot (ce-certification-qa)]

The merge was fine but running tests failed.

[xenial] [17:11:14] starting container
Device project added to xenial-testing
[xenial] [17:11:24] provisioning container
[xenial] [17:12:07] Starting tests...
[xenial] Found a test script: ./requirements/container-tests-provider-phoronix
[xenial] [17:12:37] container-tests-provider-phoronix: FAIL
[xenial] output: https://paste.ubuntu.com/p/RBHmdgcHgy/
[xenial] [17:12:40] Fixing file permissions in source directory
[xenial] [17:12:40] Destroying container
[bionic] [17:12:57] starting container
Device project added to bionic-testing
[bionic] [17:13:10] provisioning container
[bionic] [17:13:51] Starting tests...
[bionic] Found a test script: ./requirements/container-tests-provider-phoronix
[bionic] [17:14:22] container-tests-provider-phoronix: FAIL
[bionic] output: https://paste.ubuntu.com/p/kNjWgzyPyz/
[bionic] [17:14:24] Fixing file permissions in source directory
[bionic] [17:14:25] Destroying container

review: Needs Fixing

diff --git a/requirements/container-tests-provider-phoronix b/requirements/container-tests-provider-phoronix
index 5fc1891..311b403 100755
--- a/requirements/container-tests-provider-phoronix
+++ b/requirements/container-tests-provider-phoronix
@@ -9,4 +9,7 @@ git clone git://git.launchpad.net/checkbox-ng $TMPDIR/checkbox-ng
 echo "I: running 'develop' on checkbox-ng"
 ( cd $TMPDIR/checkbox-ng/ && python3 setup.py develop --quiet | sed -e 's/^/I (develop output) /' )
 
+git clone git://git.launchpad.net/plainbox-provider-resource $TMPDIR/plainbox-provider-resource
+python3 $TMPDIR/plainbox-provider-resource/manage.py develop --force
+
 ./manage.py validate
diff --git a/units/packaging.pxu b/units/packaging.pxu
index bd8f50a..f45baff 100644
--- a/units/packaging.pxu
+++ b/units/packaging.pxu
@@ -1,3 +1,3 @@
 unit: packaging meta-data
 os-id: debian
-Depends: php-cli, php-xml, xserver-xorg-dev
+Depends: php-cli, php-xml, xserver-xorg-dev, plainbox-provider-resource-generic
diff --git a/units/pts.pxu b/units/pts.pxu
index 9b773ff..cadfe36 100644
--- a/units/pts.pxu
+++ b/units/pts.pxu
@@ -12,11 +12,13 @@ include:
  pts-generate-report
  pts-attach-report
 bootstrap_include:
+ com.canonical.certification::cpuinfo
  pts-job-generator
 
 id: pts-job-generator
 category_id: phoronix
 plugin: resource
+requires: cpuinfo.platform == "x86_64"
 command:
  echo id: pts/cpuminer-opt
  echo "name: Cpuminer benchmark."
@@ -42,10 +44,12 @@ category_id: phoronix
 plugin: shell
 command:
  mkdir $PLAINBOX_SESSION_SHARE/pts-nest/
- if [ ! -z "$PTS_PRELOAD_PATH" ]; then
-   cp -r $PTS_PRELOAD_PATH/* $PLAINBOX_SESSION_SHARE/pts-nest/
-   rm -rf $PLAINBOX_SESSION_SHARE/pts-nest/test-results/*
+ if [ -z "$PTS_PRELOAD_PATH" ]; then
+   echo "PTS_PRELOAD_PATH is not defined! PTS tests cannot run" >&2
+   exit 1
  fi
+ cp -r $PTS_PRELOAD_PATH/* $PLAINBOX_SESSION_SHARE/pts-nest/
+ rm -rf $PLAINBOX_SESSION_SHARE/pts-nest/test-results/*
  cp $PLAINBOX_PROVIDER_DATA/phoronix-test-suite-configuration/* $PLAINBOX_SESSION_SHARE/pts-nest
  sed -i "s+__TARGET_PATH__+$PLAINBOX_SESSION_SHARE\/pts-nest\/+" $PLAINBOX_SESSION_SHARE/pts-nest/user-config.xml
 environ: PTS_PRELOAD_PATH
@@ -57,9 +61,6 @@ category_id: phoronix
 _summary: {name}
 command:
  export PTS_USER_PATH_OVERRIDE=$PLAINBOX_SESSION_SHARE/pts-nest/
- if [ -z "$PTS_PRELOAD_PATH" ]; then
-   $PLAINBOX_PROVIDER_DATA/phoronix-test-suite/phoronix-test-suite install {id}
- fi
  pts_wrapper.py {id}
 plugin: shell
 depends: pts-prepare-nest
@@ -69,6 +70,7 @@ environ: PTS_PRELOAD_PATH
 id: pts-generate-report
 category_id: phoronix
 plugin: shell
+depends: pts-prepare-nest
 command:
  export PTS_USER_PATH_OVERRIDE=$PLAINBOX_SESSION_SHARE/pts-nest/
  cd $PLAINBOX_SESSION_SHARE/pts-nest/test-results/