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

Proposed by Simon Fels
Status: Merged
Approved by: Konrad Zapałowicz
Approved revision: 7b120e28f8d533b2e49f02c1eb24a4733e251291
Merged at revision: bf73361f4b2f37e16781e41b040605381b1dad96
Proposed branch: ~morphis/snappy-hwe-snaps/+git/jenkins-jobs:f/archive-images
Merge into: ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master
Diff against target: 44 lines (+10/-3)
3 files modified
jobs/image/image-build-worker.sh (+1/-3)
jobs/image/image-build-worker.yaml (+6/-0)
local.yaml (+3/-0)
Reviewer Review Type Date Requested Status
Konrad Zapałowicz (community) code Approve
System Enablement Bot continuous-integration Approve
Review via email: mp+328972@code.launchpad.net

Description of the change

Archive image artifacts after a build

To post a comment you must log in.
Revision history for this message
System Enablement Bot (system-enablement-ci-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Konrad Zapałowicz (kzapalowicz) wrote :

ack

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/jobs/image/image-build-worker.sh b/jobs/image/image-build-worker.sh
2index 161c5e4..c6cd784 100644
3--- a/jobs/image/image-build-worker.sh
4+++ b/jobs/image/image-build-worker.sh
5@@ -19,9 +19,7 @@ set -ex
6 . "$WORKSPACE/.build_env"
7
8 rm -rf "$WORKSPACE"/image-builds
9-
10 git clone git+ssh://git.launchpad.net/~$LAUNCHPAD_TEAM/$LAUNCHPAD_PROJECT/+git/image-builds
11 cd image-builds
12
13-# Project specific image build process
14-./build.sh
15+./build.sh --output-dir=$WORKSPACE
16diff --git a/jobs/image/image-build-worker.yaml b/jobs/image/image-build-worker.yaml
17index f34faf3..4a39425 100644
18--- a/jobs/image/image-build-worker.yaml
19+++ b/jobs/image/image-build-worker.yaml
20@@ -13,3 +13,9 @@
21 - shell:
22 !include-raw-escape:
23 - image-build-worker.sh
24+ publishers:
25+ - archive:
26+ artifacts: '{image_artifacts}'
27+ allow-empty: 'true'
28+ fingerprint: true
29+ default-excludes: false
30\ No newline at end of file
31diff --git a/local.yaml b/local.yaml
32index 4de3a0c..9c7357b 100644
33--- a/local.yaml
34+++ b/local.yaml
35@@ -55,6 +55,9 @@
36
37 base_snap_repo_url: 'https://git.launchpad.net/~snappy-hwe-team/snappy-hwe-snaps/+git'
38
39+ # Path specifier for artifacts to archive
40+ image_artifacts: '*.tar.gz'
41+
42 jobs:
43 - snap-project-jobs
44 - image-project-jobs

Subscribers

People subscribed via source and target branches

to all changes: