VMBuilder

Merge lp:~oddbloke/vmbuilder/jenkins_kvm into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

  1. jenkins_kvm
  2. Merge into jenkins_kvm
Proposed by Dan Watkins
Status: Merged
Merged at revision: 760
Proposed branch: lp:~oddbloke/vmbuilder/jenkins_kvm
Merge into: lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm
Diff against target: 28 lines (+10/-1)
1 file modified
jenkins/CloudImages_Azure.sh (+10/-1)
To merge this branch: bzr merge lp:~oddbloke/vmbuilder/jenkins_kvm
Reviewer Review Type Date Requested Status
Robert C Jennings (community) Approve
Review via email: [email protected]
To post a comment you must log in.
Revision history for this message
Robert C Jennings (rcj) wrote :

+1

review: Approve
lp:~oddbloke/vmbuilder/jenkins_kvm updated
760. By Robert C Jennings

Use yakkety builders to build Azure yakkety images

Anything earlier doesn't understand metadata_csum, and therefore can't modify
the images.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jenkins/CloudImages_Azure.sh'
2--- jenkins/CloudImages_Azure.sh 2016-07-18 13:31:58 +0000
3+++ jenkins/CloudImages_Azure.sh 2016-08-15 07:03:34 +0000
4@@ -90,6 +90,15 @@
5 fail "Failed to resize 12.04 to full size"
6 fi
7
8+case ${SUITE} in
9+ precise|trusty|xenial)
10+ builder_img=/srv/builder/images/precise-builder-latest.img
11+ ;;
12+ *)
13+ builder_img=/srv/builder/images/yakkety-builder-latest.img
14+ ;;
15+esac
16+
17 # Launch KVM to do the work
18 ${kvm_builder}/launch_kvm.sh \
19 --id ${BUILD_ID} \
20@@ -98,7 +107,7 @@
21 --extra-disk "${raw_name}" \
22 --raw-disk "${WORKSPACE}/${SUITE}-output.raw" \
23 --raw-size ${root_size} \
24- --img-url /srv/builder/images/precise-builder-latest.img ||
25+ --img-url ${builder_img} ||
26 fail "KVM instance failed to build image."
27
28 rm "${WORKSPACE}/${SUITE}-output.raw"

Subscribers

People subscribed via source and target branches