maas-images

Merge lp:~ltrager/maas-images/hwe_placeholder into lp:maas-images

  1. hwe_placeholder
  2. Merge into maas-ephemerals
Proposed by Lee Trager
Status: Rejected
Rejected by: Lee Trager
Proposed branch: lp:~ltrager/maas-images/hwe_placeholder
Merge into: lp:maas-images
Prerequisite: lp:~ltrager/maas-images/add_subarch
Diff against target: 78 lines (+24/-7)
1 file modified
conf/meph-v3.yaml (+24/-7)
To merge this branch: bzr merge lp:~ltrager/maas-images/hwe_placeholder
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+307047@code.launchpad.net

Commit message

Add placeholders for hwe-16.04 and hwe-16.10

Description of the change

Yesterday we replaced the hwe-* subarches with ga-* subarches as Xenial and Yakkety only have the GA kernels available, not the new hwe kernels. Since we've already published the hwe-* at https://images.maas.io/ephemeral-v3/daily/ this adds them back. This is so we don't have to regenerate the streams and the hwe-* subarches are kept up to date until the real hwe-* kernels are made available(should be around Yakkety release).

Example metadata: http://paste.ubuntu.com/23247089/

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm!

review: Approve
lp:~ltrager/maas-images/hwe_placeholder updated
337. By Lee Trager

Merge trunk

338. By Lee Trager

Keep hwe-x for trusty in the subarches list.

Unmerged revisions

338. By Lee Trager

Keep hwe-x for trusty in the subarches list.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf/meph-v3.yaml'
2--- conf/meph-v3.yaml 2016-09-28 17:45:06 +0000
3+++ conf/meph-v3.yaml 2016-09-28 19:17:08 +0000
4@@ -26,6 +26,7 @@
5 - &sa_hwe_w [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
6 - &sa_hwe_x [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04]
7 - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10]
8+ - &sa_hwe_x_old [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
9 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
10 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
11 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
12@@ -47,29 +48,45 @@
13 kernels:
14 - [yakkety, amd64, ga-16.10, generic, linux-generic, *sa_hwe_y]
15 - [yakkety, amd64, ga-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
16+ - [yakkety, amd64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
17+ - [yakkety, amd64, hwe-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
18 - [yakkety, arm64, ga-16.10, generic, linux-generic, *sa_hwe_y]
19+ - [yakkety, arm64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
20 - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
21 - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
22 - [yakkety, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
23 - [yakkety, armhf, ga-16.10, generic, linux-generic, *arm_hwe_y]
24+ - [yakkety, armhf, hwe-16.10, generic, linux-generic, *arm_hwe_y]
25 - [yakkety, i386, ga-16.10, generic, linux-generic, *sa_hwe_y]
26 - [yakkety, i386, ga-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
27+ - [yakkety, i386, hwe-16.10, generic, linux-generic, *sa_hwe_y]
28+ - [yakkety, i386, hwe-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
29 - [yakkety, ppc64el, ga-16.10, generic, linux-generic, *sa_hwe_y]
30+ - [yakkety, ppc64el, hwe-16.10, generic, linux-generic, *sa_hwe_y]
31 - [yakkety, s390x, ga-16.10, generic, linux-generic, *sa_hwe_y]
32+ - [yakkety, s390x, hwe-16.10, generic, linux-generic, *sa_hwe_y]
33 - version: "16.04"
34 release: xenial
35 kernels:
36 - [xenial, amd64, ga-16.04, generic, linux-generic, *sa_hwe_x]
37 - [xenial, amd64, ga-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
38+ - [xenial, amd64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
39+ - [xenial, amd64, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
40 - [xenial, arm64, ga-16.04, generic, linux-generic, *sa_hwe_x]
41 - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
42 - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
43+ - [xenial, arm64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
44 - [xenial, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
45 - [xenial, armhf, ga-16.04, generic, linux-generic, *arm_hwe_x]
46+ - [xenial, armhf, hwe-16.04, generic, linux-generic, *arm_hwe_x]
47 - [xenial, i386, ga-16.04, generic, linux-generic, *sa_hwe_x]
48 - [xenial, i386, ga-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
49+ - [xenial, i386, hwe-16.04, generic, linux-generic, *sa_hwe_x]
50+ - [xenial, i386, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
51 - [xenial, ppc64el, ga-16.04, generic, linux-generic, *sa_hwe_x]
52+ - [xenial, ppc64el, hwe-16.04, generic, linux-generic, *sa_hwe_x]
53 - [xenial, s390x, ga-16.04, generic, linux-generic, *sa_hwe_x]
54+ - [xenial, s390x, hwe-16.04, generic, linux-generic, *sa_hwe_x]
55 - version: "14.04"
56 builtin_kernel: linux-generic
57 release: trusty
58@@ -98,13 +115,13 @@
59 - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
60 - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
61 - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
62- - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
63- - [xenial, amd64, hwe-x, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
64- - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
65- - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
66- - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
67- - [xenial, i386, hwe-x, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
68- - [xenial, ppc64el, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]
69+ - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
70+ - [xenial, amd64, hwe-x, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x_old]
71+ - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
72+ - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
73+ - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
74+ - [xenial, i386, hwe-x, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x_old]
75+ - [xenial, ppc64el, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
76 - version: "12.04"
77 release: precise
78 builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'}

Subscribers

People subscribed via source and target branches