canonical-hw-cert team mailing list archive

[Michał Sawicz <mp+425875@xxxxxxxxxxxxxxxxxx>]

Michał Sawicz has proposed merging hwcert-jenkins-jobs:mir-fix-classic-refresh into hwcert-jenkins-jobs:master.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~hwcert-jenkins/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/425875
-- 
Your team hwcert-jenkins is requested to review the proposed merge of hwcert-jenkins-jobs:mir-fix-classic-refresh into hwcert-jenkins-jobs:master.

diff --git a/jobs/mir/run-mir.sh b/jobs/mir/run-mir.sh
index de16a12..7b1e7f4 100644
--- a/jobs/mir/run-mir.sh
+++ b/jobs/mir/run-mir.sh
@@ -85,11 +85,11 @@ cat > job.yaml <<EOF
 
         if [ '{snap}' == 'mir-test-tools' ]; then
             sudo snap install mir-test-tools --channel={channel}
-        elif [[ '{snap}' == mir-* ]]; then
-            sudo snap install {snap} --channel={channel}
+        elif [[ '{snap}' == mir-* || '{snap}' == ubuntu-frame ]]; then
+            sudo sh -c "snap \\\$( snap list {snap} >&2 && echo refresh --ignore-validation || echo install ) {snap} --channel={channel}"
             sudo snap install mir-test-tools --channel={channel}
         else
-            sudo snap install {snap} --channel={channel}
+            sudo sh -c "snap \\\$( snap list {snap} >&2 && echo refresh --ignore-validation || echo install ) {snap} --channel={channel}"
             sudo snap install mir-test-tools
         fi