Merge ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/archive-images into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[Simon Fels]

Archive image artifacts after a build

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:7b120e28f8d533b2e49f02c1eb24a4733e251291
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1881/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3033
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1789/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3311

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1881/rebuild

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

ack

review: Approve (code)

diff --git a/jobs/image/image-build-worker.sh b/jobs/image/image-build-worker.sh
index 161c5e4..c6cd784 100644
--- a/jobs/image/image-build-worker.sh
+++ b/jobs/image/image-build-worker.sh
@@ -19,9 +19,7 @@ set -ex
 . "$WORKSPACE/.build_env"
 
 rm -rf "$WORKSPACE"/image-builds
-
 git clone git+ssh://git.launchpad.net/~$LAUNCHPAD_TEAM/$LAUNCHPAD_PROJECT/+git/image-builds
 cd image-builds
 
-# Project specific image build process
-./build.sh
+./build.sh --output-dir=$WORKSPACE
diff --git a/jobs/image/image-build-worker.yaml b/jobs/image/image-build-worker.yaml
index f34faf3..4a39425 100644
--- a/jobs/image/image-build-worker.yaml
+++ b/jobs/image/image-build-worker.yaml
@@ -13,3 +13,9 @@
         - shell:
             !include-raw-escape:
                 - image-build-worker.sh
+    publishers:
+        - archive:
+            artifacts: '{image_artifacts}'
+            allow-empty: 'true'
+            fingerprint: true
+            default-excludes: false
 \ No newline at end of file
diff --git a/local.yaml b/local.yaml
index 4de3a0c..9c7357b 100644
--- a/local.yaml
+++ b/local.yaml
@@ -55,6 +55,9 @@
 
     base_snap_repo_url: 'https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git'
 
+    # Path specifier for artifacts to archive
+    image_artifacts: '*.tar.gz'
+
     jobs:
         - snap-project-jobs
         - image-project-jobs