Merge lp:~xnox/qa-jenkins-jobs/enable-s390x-edge into lp:qa-jenkins-jobs

[Dimitri John Ledkov]

Enable edge job for s390x (should work) as inject snap script in subiquity does claim to support injecting snaps for amd64 & s390x.

[Paride Legovini (paride)]

review: Approve

=== modified file 'jobs/iso-testing/jobs-s390x-live-server.yaml'
--- jobs/iso-testing/jobs-s390x-live-server.yaml	2019-04-03 18:46:23 +0000
+++ jobs/iso-testing/jobs-s390x-live-server.yaml	2019-04-15 09:23:27 +0000
@@ -32,6 +32,7 @@
         # - 'ubuntu-{supported-release}-live-server-s390x-iso-download'
         - 'ubuntu-{release}-live-server-s390x-iso-static-validation'
         - 'ubuntu-{release}-live-server-s390x-smoke-default'
+        - 'ubuntu-{release}-live-server-s390x-smoke-edge'
 
 
 - job-template:
@@ -121,3 +122,38 @@
         - archive-artifacts
         - trigger-mark-pending-current
         - mark-junit
+
+- job-template:
+    name: 'ubuntu-{release}-live-server-s390x-smoke-edge'
+    description: |
+        Run live-server iso test with edge snap of subiquity
+        Defined in lp:qa-jenkins-jobs
+    node: 'iso-testing'
+    triggers:
+        - reverse:
+            jobs: 'ubuntu-{release}-live-server-s390x-smoke-default'
+            result: 'success'
+    builders:
+        - clear-artifacts:
+        - shell: |
+            #!/bin/bash -x
+            ISO_NAME="edge-{release}-live-server-s390x.iso"
+
+            git clone https://github.com/CanonicalLtd/subiquity
+            https_proxy=http://squid.internal:3128/ \
+                sudo ./subiquity/scripts/make-edge-iso.sh \
+                /var/cache/utah/iso/{release}-live-server-s390x.iso \
+                "$ISO_NAME"
+
+            if [ ! -f "$ISO_NAME" ]; then
+                exit 1
+            fi
+
+            bzr branch lp:qa-jenkins-jobs
+            ./qa-jenkins-jobs/scripts/iso-testing/run-iso-test.sh \
+                --test default --variant live-server \
+                --arch s390x --iso "$WORKSPACE/$ISO_NAME"
+    publishers:
+        - archive-artifacts
+        - email:
+            recipients: '[e-mail] [e-mail]'