Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/jenkins-jobs:fix-hw-tests into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Alfonso Sanchez-Beato]

Fix tests run by testflinger, as now the testflinger server
is in fact a container and needs some configuration.

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (continuous-integration)

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:cfd48bb7f63b2db05b9f3240905e09f9d0bc7da1
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1925/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3267
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1833/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3530

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1925/rebuild

review: Approve (continuous-integration)

diff --git a/tools/hardware-test.sh b/tools/hardware-test.sh
index 309409d..30c9a9f 100755
--- a/tools/hardware-test.sh
+++ b/tools/hardware-test.sh
@@ -68,6 +68,8 @@ provision_data:
   channel: stable
 test_data:
   test_cmds:
+    - sudo apt update
+    - sudo apt install --yes git curl
     - git clone --depth 1 -b $BRANCH $REPO src
     - cd src && curl -s -O https://niemeyer.s3.amazonaws.com/spread-amd64.tar.gz && tar xzvf spread-amd64.tar.gz
     - $DEVICE_SSH "sudo adduser --extrausers --quiet --disabled-password --gecos '' $DEVICE_USER"
@@ -85,7 +87,7 @@ set -ex
 
 cd $REMOTE_WORKSPACE
 if ! which virtualenv; then
-    sudo apt install --yes --allow-downgrades --allow-remove-essential --allow-change-held-packages virtualenv
+    sudo apt install --yes virtualenv
 fi
 
 git clone https://git.launchpad.net/testflinger-cli