canonical-hw-cert team mailing list archive

["LIAO, YU-SIANG" <mp+437859@xxxxxxxxxxxxxxxxxx>]

LIAO, YU-SIANG has proposed merging ~flyjerry0415/hwcert-jenkins-jobs:fix-xenial-checkbox-install-error into hwcert-jenkins-jobs:master.

Commit message:
Modify:: modify checkbox install command of xenial version in run-sru.sh

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~flyjerry0415/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/437859
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~flyjerry0415/hwcert-jenkins-jobs:fix-xenial-checkbox-install-error into hwcert-jenkins-jobs:master.

diff --git a/jobs/sru/run-sru.sh b/jobs/sru/run-sru.sh
index 00b80d5..6d4dfef 100644
--- a/jobs/sru/run-sru.sh
+++ b/jobs/sru/run-sru.sh
@@ -173,8 +173,13 @@ cat > job.yaml <<EOF
             _run sudo fuser -v /var/lib/apt/lists/lock
             _run sudo fuser -v /var/lib/dpkg/lock
             _run sudo fuser -v /var/cache/debconf/config.dat
-            _run sudo DEBIAN_FRONTEND={debian_frontend} apt-get -qq install -o Dpkg::Options::="--force-confdef" -y --force-yes checkbox-ng python3-checkbox-ng checkbox-provider-base checkbox-provider-resource checkbox-provider-sru fswebcam obexftp wmctrl iperf mesa-utils vim pastebinit fwts xorg-dev gir1.2-clutter-1.0
-        
+
+            if [ {series} = xenial ]; then
+              _run sudo DEBIAN_FRONTEND={debian_frontend} apt-get -qq install -o Dpkg::Options::="--force-confdef" -y --force-yes checkbox-ng python3-checkbox-ng plainbox-provider-checkbox plainbox-provider-resource-generic plainbox-provider-sru fswebcam obexftp wmctrl iperf mesa-utils vim pastebinit fwts xorg-dev gir1.2-clutter-1.0
+            else
+              _run sudo DEBIAN_FRONTEND={debian_frontend} apt-get -qq install -o Dpkg::Options::="--force-confdef" -y --force-yes checkbox-ng python3-checkbox-ng checkbox-provider-base checkbox-provider-resource checkbox-provider-sru fswebcam obexftp wmctrl iperf mesa-utils vim pastebinit fwts xorg-dev gir1.2-clutter-1.0
+            fi
+
             # Phoronix Test Suite provider is only available for some releases
             if [[ {arch} = amd64 ]] && [[ {series} =~ ^(xenial|bionic)$ ]]; then
                 _run sudo apt-get install -y checkbox-provider-phoronix libssl1.1