Merge lp:~saviq/simplestreams/add-vhd-images into lp:simplestreams

Proposed by Michał Sawicz on 2017-04-27
Status: Rejected
Rejected by: Scott Moser on 2018-06-26
Proposed branch: lp:~saviq/simplestreams/add-vhd-images
Merge into: lp:simplestreams
Diff against target: 46 lines (+18/-1)
2 files modified
tools/make-test-data (+2/-0)
tools/toolutil.py (+16/-1)
To merge this branch: bzr merge lp:~saviq/simplestreams/add-vhd-images
Reviewer Review Type Date Requested Status
Scott Moser 2017-04-27 Needs Information on 2018-02-17
Server Team CI bot continuous-integration Approve on 2017-06-01
Robert C Jennings 2018-02-17 Pending
Review via email: mp+323325@code.launchpad.net

Commit message

Include VHD images in the stream

Description of the change

Note this suffers from bug #1686750

To post a comment you must log in.
Scott Moser (smoser) wrote :

The patch here looks fine, but I wont merge it without someone on cpc team approval.

I do have the general dislike of Ubuntu publishing .vmdk and .qcow2 and
 .here-is-another-format-that-a-hypervisor-could-convert-from-the-open-standard-qcow2.

But that is my only objection, and based on the many formats we publish, we've decided not to use Ubuntu's leverage to help the industry with interoperability.

450. By Michał Sawicz on 2017-04-27

Include VHD images in the stream

Scott Moser (smoser) wrote :

Is this still necessary?
Desireable?

review: Needs Information
Michał Sawicz (saviq) wrote :

I've decided to convert from qcow2 because of the large size (30G) of VHD images, so I'm fine dropping this.

Scott Moser (smoser) wrote :

Hi.
We've moved simplestreams from bzr on launchpad to git on launchpad.
I'm going to mark this merge proposal as Rejected based only on
the fact that it is a bzr based merge proposal.

Please feel free to re-submit the merge proposal using the launchpad git.
Hopefully the cloud-init doc at
 http://cloudinit.readthedocs.io/en/latest/topics/hacking.html
should give you an idea on how to do that.

Unmerged revisions

450. By Michał Sawicz on 2017-04-27

Include VHD images in the stream

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/make-test-data'
2--- tools/make-test-data 2016-11-28 14:54:35 +0000
3+++ tools/make-test-data 2017-04-27 14:45:47 +0000
4@@ -63,6 +63,8 @@
5 'squashfs': {'size': 12400},
6 'squashfs.manifest': {'size': 12401},
7 'img': {'size': 12402},
8+ 'disk1.vhd.zip': {'size': 12403},
9+ 'vhd.zip': {'size': 12404},
10 }
11
12 EC2_ENDPOINTS = {
13
14=== modified file 'tools/toolutil.py'
15--- tools/toolutil.py 2016-08-02 20:54:11 +0000
16+++ tools/toolutil.py 2017-04-27 14:45:47 +0000
17@@ -111,6 +111,20 @@
18 if rel == "xenial" and serial <= "20160420.3":
19 return False
20
21+ if suffix == "-disk1.vhd.zip":
22+ # -disk1.vhd.zip only available in xenial
23+ if codename_cmp(rel, "==", "xenial"):
24+ return False
25+ if arch != "amd64":
26+ return False
27+
28+ if suffix == ".vhd.zip":
29+ # .vhd.zip started in yakkety
30+ if codename_cmp(rel, "<", "yakkety"):
31+ return False
32+ if arch != "amd64":
33+ return False
34+
35 # if some data in /query is not truely available, fill up this array
36 # to skip it. ex: export BROKEN="precise/20121212.1 quantal/20130128.1"
37 broken = os.environ.get("BROKEN", "").split(" ")
38@@ -129,7 +143,8 @@
39
40 suffixes = (".tar.gz", "-root.tar.gz", "-disk1.img", "-uefi1.img",
41 ".manifest", ".ova", "-root.tar.xz", "-lxd.tar.xz",
42- ".squashfs", ".squashfs.manifest", ".img",)
43+ ".squashfs", ".squashfs.manifest", ".img", "-disk1.vhd.zip",
44+ ".vhd.zip",)
45 streams = [f[0:-len(".latest.txt")]
46 for f in os.listdir(path) if f.endswith("latest.txt")]
47

Subscribers

People subscribed via source and target branches