Merge ~jasonlo/snappy-hwe-snaps/+git/jenkins-jobs:merge into ~snappy-hwe-team/snappy-hwe-snaps/+git/jenkins-jobs:master

[lo]

1. Verify image-builds to become image-build without S.
2. Add --build-id=$BUILD_ID into build script.

We need <jenkins build id> as image index. Since in Hohhot we use a Makefile to create the image, this parameter should be passed into the Makefile to create the right naming.

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

PASSED: Continuous integration, rev:a3593b9768633307bf80f8ec4ba1dd627f5c16ff
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1899/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3151
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1807/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3416

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

review: Approve (continuous-integration)

[Simon Fels (morphis)]

review: Needs Information

e5bbe3b... by lo on 2017-08-23

Change archive files to be img and bin in image build worker.

[Jim Hodapp (jhodapp)]

Can you add to the MR description what you need the build-id for?

[lo (jasonlo)]

> Can you add to the MR description what you need the build-id for?

According to CE Image Builds
https://docs.google.com/document/d/1zoebLPlBym5DAbHFJgr7geCyqxNheSazMEueSfHcxFQ/edit#
Image name: <project>-<version>-<type>-<grade>-<date>-<jenkins build id>-<partition>.img

We need <jenkins build id> as image index. Since in Hohhot we use Makefile to create the image, this parameter should be pass to Makefile to create the right naming.

212d6d0... by lo on 2017-08-24

Build script using Jenkins env BUILD_ID or given a default value 0.

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

PASSED: Continuous integration, rev:212d6d0eec257f301bc265236ed523523149fd6c
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/1901/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-build-snap-worker/3163
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/1809/console
    SUCCESS: https://jenkins.canonical.com/system-enablement/job/generic-test-snap/3428

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

review: Approve (continuous-integration)

[Jim Hodapp (jhodapp)]

LGTM

review: Approve

[Simon Fels (morphis)]

review: Approve

[Jim Hodapp (jhodapp)]

@Jason: ready for top approval of this? Also, make sure to check Simon's comment inline below.

Unmerged commits

212d6d0... by lo on 2017-08-24

Build script using Jenkins env BUILD_ID or given a default value 0.

e5bbe3b... by lo on 2017-08-23

Change archive files to be img and bin in image build worker.

a3593b9... by lo on 2017-08-23

Verify image-builds to become image-build, and add build-id parameter in build.sh.

diff --git a/jobs/image/image-build-worker.sh b/jobs/image/image-build-worker.sh
index c6cd784..ba5e646 100644
--- a/jobs/image/image-build-worker.sh
+++ b/jobs/image/image-build-worker.sh
@@ -18,8 +18,8 @@ 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
+rm -rf "$WORKSPACE"/image-build
+git clone git+ssh://git.launchpad.net/~$LAUNCHPAD_TEAM/$LAUNCHPAD_PROJECT/+git/image-build
+cd image-build
 
-./build.sh --output-dir=$WORKSPACE
+exec ./build.sh --output-dir=$WORKSPACE
diff --git a/jobs/image/image-build-worker.yaml b/jobs/image/image-build-worker.yaml
index 4a39425..90dbed6 100644
--- a/jobs/image/image-build-worker.yaml
+++ b/jobs/image/image-build-worker.yaml
@@ -15,7 +15,7 @@
                 - image-build-worker.sh
     publishers:
         - archive:
-            artifacts: '{image_artifacts}'
+            artifacts: '*img*, *bin*'
             allow-empty: 'true'
             fingerprint: true
-            default-excludes: false
\ No newline at end of file
+            default-excludes: false