Merge ~mwhudson/qa-jenkins-jobs/+git/qa-jenkins-jobs:live-server-layers into qa-jenkins-jobs:master

[Michael Hudson-Doyle]

use livefs-editor to make edge-testing ISOs for subiquity

the live server ISOs use layers now, which make-edge-iso.sh doesn't work
with. I've just updated my livefs-editor scripts to work with layers so
let's use that instead.

Unmerged commits

ef87a94... by Michael Hudson-Doyle on 2021-07-19

use livefs-editor to make edge-testing ISOs for subiquity

the live server ISOs use layers now, which make-edge-iso.sh doesn't work
with. I've just updated my livefs-editor scripts to work with layers so
let's use that instead.

diff --git a/jobs/iso-testing/jobs-server.yaml b/jobs/iso-testing/jobs-server.yaml
index 78edea6..cbd3672 100644
--- a/jobs/iso-testing/jobs-server.yaml
+++ b/jobs/iso-testing/jobs-server.yaml
@@ -289,11 +289,12 @@
 
             ISO_NAME="edge-{release}-{variant}-{arch}.iso"
 
-            retry git clone --depth 1 https://github.com/canonical/subiquity
+            retry git clone --depth 1 https://github.com/mwhudson/livefs-editor
             https_proxy=http://squid.internal:3128/ \
-                sudo ./subiquity/scripts/make-edge-iso.sh \
+                sudo PYTHONPATH=./livefs-editor python3 -m livefs_edit
                 /var/cache/utah/iso/{release}-{variant}-{arch}.iso \
-                "$ISO_NAME"
+                "$ISO_NAME" \
+                --add-snap-from-store subiquity edge
 
             [[ -f "$ISO_NAME" ]] || exit 1
         - run-iso-test-server: