Merge lp://staging/~ltrager/maas-images/edge into lp://staging/maas-images

Proposed by Lee Trager
Status: Merged
Merged at revision: 352
Proposed branch: lp://staging/~ltrager/maas-images/edge
Merge into: lp://staging/maas-images
Diff against target: 213 lines (+88/-71)
3 files modified
conf/meph-v3.yaml (+80/-70)
meph2/netinst.py (+1/-0)
meph2/stream.py (+7/-1)
To merge this branch: bzr merge lp://staging/~ltrager/maas-images/edge
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+313479@code.staging.launchpad.net

Commit message

Add hwe-16.04-edge and hwe-16.04-lowlatency-edge kernels to the V3 stream.

This adds the hwe-16.04-edge and hwe-16.04-lowlatency-edge kernels to the V3 stream. As the new names caused the yaml columns to be unaligned this adds extra spaces to align all columns making the meph-v3.yaml file easier to read and edit. While testing I discovered a small bug where edge was being added before the kflavor in the product name as well as a lint error.

Description of the change

A test stream is up at http://162.213.35.187/edge/ which can be used in MAAS with the http://162.213.35.187/maas-crew.gpg key.

A diff of meph-v3.yaml with the extra spaces removed is at http://paste.ubuntu.com/23748972/

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

I think its probably best to leave the white space changes on precise and trusty out.
That will make all those lines 'blame' to this, which just makes digging more difficult. The releases really do stand mostly on their own . I understand you were trying to align the fields across all releases, but doing so means maintaining that in the future (on a long kernel name or something), which just means more arbitrary white space changes.

It also makes this file unnecessarily different to the v2 conf in those lines.

I'm not terrribly fussed about it, but i'd leave them out.

The other comment / question I have is wrt to hwe-16.10. Why do we want or need that ?
Wouldn't it be sufficient to say that ga-16.10 supports hwe-16.10 ?

As it is right now, i think that you'll end up creating 2 different initramfs due to their timestamps and such, and then publishing those 2 different things for download. That will waste space and generally be confusing ... "Why are those different?".

353. By Lee Trager

Keep spacing the same for Precise and Trusty

Revision history for this message
Lee Trager (ltrager) wrote :

Thanks for the review. I've reverted the spacing for Precise and Trusty but kept it the same for Xenial and above. The spacing for Xenial and above should give us a good amount of wiggle room incase we decide to add more flavors without changing the spacing.

hwe-16.10 and ga-16.10 are normally two different kernels(see https://wiki.ubuntu.com/Kernel/RollingLTSEnablementStack). When we released the V3 stream we set the hwe-16.10 kernel to the ga-16.10 kernel for testing as we expected the actual hwe-16.10 kernel be released before MAAS 2.1 release. This is technically correct as the ga-16.10 kernel is the latest hwe kernel available on Yakkety. Once the kernel team releases the real hwe-16.10 kernel I'll update the config.

Revision history for this message
Scott Moser (smoser) wrote :

"hwe-16.10 and ga-16.10 are normally two different kernels"

I'm pretty sure that is not true, while the following *is* true:
   "hwe-16.04 and ga-16.04 are normally two different"

I specifically mentioned 16.10.

Revision history for this message
Andres Rodriguez (andreserl) wrote :

This branch is not meant to address whatever is already landed and released/published. This branch is to land other *new* stuff. I';m not gonna block this branch from landing because it doesn't address something that's already there.

If we want to address or change that, we can do so in a following branch.

review: Approve
Revision history for this message
Andres Rodriguez (andreserl) wrote :

Also please file a bug on the hwe-16.10 issue and prepare a different branch.

review: Approve
Revision history for this message
Lee Trager (ltrager) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches