Merge ~alfonsosanchezbeato/snappy-hwe-snaps/+git/build-scripts:install-git into ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master

Proposed by Alfonso Sanchez-Beato
Status: Merged
Approved by: Konrad Zapałowicz
Approved revision: 0e694c098c07057ca75fe28e055f5b9efb4bd7d4
Merged at revision: 1ffbe692558ed3a7fcd0b77729c2ae0e8d54a982
Proposed branch: ~alfonsosanchezbeato/snappy-hwe-snaps/+git/build-scripts:install-git
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/build-scripts:master
Diff against target: 22 lines (+3/-1)
1 file modified
scripts/hardware-test.sh (+3/-1)
Reviewer Review Type Date Requested Status
Konrad Zapałowicz (community) Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+329951@code.launchpad.net

Description of the change

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/hardware-test.sh b/scripts/hardware-test.sh
2index 309409d..30c9a9f 100755
3--- a/scripts/hardware-test.sh
4+++ b/scripts/hardware-test.sh
5@@ -68,6 +68,8 @@ provision_data:
6 channel: stable
7 test_data:
8 test_cmds:
9+ - sudo apt update
10+ - sudo apt install --yes git curl
11 - git clone --depth 1 -b $BRANCH $REPO src
12 - cd src && curl -s -O https://niemeyer.s3.amazonaws.com/spread-amd64.tar.gz && tar xzvf spread-amd64.tar.gz
13 - $DEVICE_SSH "sudo adduser --extrausers --quiet --disabled-password --gecos '' $DEVICE_USER"
14@@ -85,7 +87,7 @@ set -ex
15
16 cd $REMOTE_WORKSPACE
17 if ! which virtualenv; then
18- sudo apt install --yes --allow-downgrades --allow-remove-essential --allow-change-held-packages virtualenv
19+ sudo apt install --yes virtualenv
20 fi
21
22 git clone https://git.launchpad.net/testflinger-cli

Subscribers

People subscribed via source and target branches