canonical-hw-cert team mailing list archive

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

Michał Sawicz has proposed merging hwcert-jenkins-jobs:fix-mir-tests 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/442676
-- 
Your team hwcert-jenkins is requested to review the proposed merge of hwcert-jenkins-jobs:fix-mir-tests into hwcert-jenkins-jobs:master.

diff --git a/jobs/mir/projects/desktop-performance.yaml b/jobs/mir/projects/desktop-performance.yaml
index bbcac8e..7dec186 100644
--- a/jobs/mir/projects/desktop-performance.yaml
+++ b/jobs/mir/projects/desktop-performance.yaml
@@ -58,11 +58,6 @@
     series: jammy
     image: jammy
 - project:
-    <<: *nvidia
-    name: jammy-mir-performance-nvidia-gfx
-    series: jammy
-    image: jammy
-- project:
     <<: *intel-kiosk
     name: jammy-mir-kiosk-performance-intel-gfx
     series: jammy
diff --git a/jobs/mir/run-core-mir-track.sh b/jobs/mir/run-core-mir-track.sh
index 1fe4e58..ccf6e7b 100644
--- a/jobs/mir/run-core-mir-track.sh
+++ b/jobs/mir/run-core-mir-track.sh
@@ -102,7 +102,7 @@ cat > job.yaml <<EOF
 
         if [ "{snap}" == "mir-test-tools" ]; then
             _run_retry sudo snap install {snap} --channel={mir-base}/{channel} --no-wait {extra_args}
-        elif [[ '{snap} == ubuntu-frame' ]]; then
+        elif [ "{snap}" == "ubuntu-frame" ]; then
             _run_retry sudo "snap \$( _run snap list {snap} >&2 && echo refresh --ignore-validation || echo install ) {snap} --channel={track}/{channel} --no-wait {extra_args}"
             _run_retry sudo snap install mir-test-tools --channel={mir-base}/{channel} --no-wait
         else