canonical-hw-cert team mailing list archive

[Jonathan Cave <mp+427632@xxxxxxxxxxxxxxxxxx>]

Jonathan Cave has proposed merging ~jocave/hwcert-jenkins-jobs:identify-core22-CORESNAP into hwcert-jenkins-jobs:master.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~jocave/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/427632

Should attempt to identify the appropriate core snap on uc22 images
-- 
Your team hwcert-jenkins is requested to review the proposed merge of ~jocave/hwcert-jenkins-jobs:identify-core22-CORESNAP into hwcert-jenkins-jobs:master.

diff --git a/jobs/snap-testing/run-checkbox-snappy.sh b/jobs/snap-testing/run-checkbox-snappy.sh
index 3705be3..f6e06cc 100644
--- a/jobs/snap-testing/run-checkbox-snappy.sh
+++ b/jobs/snap-testing/run-checkbox-snappy.sh
@@ -160,7 +160,9 @@ cat > job.yaml <<EOF
         fi
 
         SNAPLIST=\$(_run_retry snap list |awk '{{{{ print \$1 }}}}' |tail -n +2)
-        if [[ "\$SNAPLIST" =~ .*"core20".* ]]; then
+        if [[ "\$SNAPLIST" =~ .*"core22".* ]]; then
+            CORESNAP="core22"
+        elif [[ "\$SNAPLIST" =~ .*"core20".* ]]; then
             CORESNAP="core20"
         elif [[ "\$SNAPLIST" =~ .*"core18".* ]]; then
             CORESNAP="core18"