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
=== modified file 'conf/meph-v3.yaml'
--- conf/meph-v3.yaml 2016-09-28 17:45:06 +0000
+++ conf/meph-v3.yaml 2016-09-28 19:17:08 +0000
@@ -26,6 +26,7 @@
26 - &sa_hwe_w [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]26 - &sa_hwe_w [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
27 - &sa_hwe_x [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04]27 - &sa_hwe_x [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04]
28 - &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]28 - &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]
29 - &sa_hwe_x_old [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
29 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]30 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
30 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]31 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
31 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]32 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
@@ -47,29 +48,45 @@
47 kernels:48 kernels:
48 - [yakkety, amd64, ga-16.10, generic, linux-generic, *sa_hwe_y]49 - [yakkety, amd64, ga-16.10, generic, linux-generic, *sa_hwe_y]
49 - [yakkety, amd64, ga-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]50 - [yakkety, amd64, ga-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
51 - [yakkety, amd64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
52 - [yakkety, amd64, hwe-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
50 - [yakkety, arm64, ga-16.10, generic, linux-generic, *sa_hwe_y]53 - [yakkety, arm64, ga-16.10, generic, linux-generic, *sa_hwe_y]
54 - [yakkety, arm64, hwe-16.10, generic, linux-generic, *sa_hwe_y]
51 - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]55 - [yakkety, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
52 - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]56 - [yakkety, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
53 - [yakkety, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]57 - [yakkety, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
54 - [yakkety, armhf, ga-16.10, generic, linux-generic, *arm_hwe_y]58 - [yakkety, armhf, ga-16.10, generic, linux-generic, *arm_hwe_y]
59 - [yakkety, armhf, hwe-16.10, generic, linux-generic, *arm_hwe_y]
55 - [yakkety, i386, ga-16.10, generic, linux-generic, *sa_hwe_y]60 - [yakkety, i386, ga-16.10, generic, linux-generic, *sa_hwe_y]
56 - [yakkety, i386, ga-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]61 - [yakkety, i386, ga-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
62 - [yakkety, i386, hwe-16.10, generic, linux-generic, *sa_hwe_y]
63 - [yakkety, i386, hwe-16.10, lowlatency, linux-image-lowlatency, *sa_hwe_y]
57 - [yakkety, ppc64el, ga-16.10, generic, linux-generic, *sa_hwe_y]64 - [yakkety, ppc64el, ga-16.10, generic, linux-generic, *sa_hwe_y]
65 - [yakkety, ppc64el, hwe-16.10, generic, linux-generic, *sa_hwe_y]
58 - [yakkety, s390x, ga-16.10, generic, linux-generic, *sa_hwe_y]66 - [yakkety, s390x, ga-16.10, generic, linux-generic, *sa_hwe_y]
67 - [yakkety, s390x, hwe-16.10, generic, linux-generic, *sa_hwe_y]
59 - version: "16.04"68 - version: "16.04"
60 release: xenial69 release: xenial
61 kernels:70 kernels:
62 - [xenial, amd64, ga-16.04, generic, linux-generic, *sa_hwe_x]71 - [xenial, amd64, ga-16.04, generic, linux-generic, *sa_hwe_x]
63 - [xenial, amd64, ga-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]72 - [xenial, amd64, ga-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
73 - [xenial, amd64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
74 - [xenial, amd64, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
64 - [xenial, arm64, ga-16.04, generic, linux-generic, *sa_hwe_x]75 - [xenial, arm64, ga-16.04, generic, linux-generic, *sa_hwe_x]
65 - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]76 - [xenial, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
66 - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]77 - [xenial, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
78 - [xenial, arm64, hwe-16.04, generic, linux-generic, *sa_hwe_x]
67 - [xenial, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]79 - [xenial, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
68 - [xenial, armhf, ga-16.04, generic, linux-generic, *arm_hwe_x]80 - [xenial, armhf, ga-16.04, generic, linux-generic, *arm_hwe_x]
81 - [xenial, armhf, hwe-16.04, generic, linux-generic, *arm_hwe_x]
69 - [xenial, i386, ga-16.04, generic, linux-generic, *sa_hwe_x]82 - [xenial, i386, ga-16.04, generic, linux-generic, *sa_hwe_x]
70 - [xenial, i386, ga-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]83 - [xenial, i386, ga-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
84 - [xenial, i386, hwe-16.04, generic, linux-generic, *sa_hwe_x]
85 - [xenial, i386, hwe-16.04, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]
71 - [xenial, ppc64el, ga-16.04, generic, linux-generic, *sa_hwe_x]86 - [xenial, ppc64el, ga-16.04, generic, linux-generic, *sa_hwe_x]
87 - [xenial, ppc64el, hwe-16.04, generic, linux-generic, *sa_hwe_x]
72 - [xenial, s390x, ga-16.04, generic, linux-generic, *sa_hwe_x]88 - [xenial, s390x, ga-16.04, generic, linux-generic, *sa_hwe_x]
89 - [xenial, s390x, hwe-16.04, generic, linux-generic, *sa_hwe_x]
73 - version: "14.04"90 - version: "14.04"
74 builtin_kernel: linux-generic91 builtin_kernel: linux-generic
75 release: trusty92 release: trusty
@@ -98,13 +115,13 @@
98 - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]115 - [wily, armhf, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
99 - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]116 - [wily, i386, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
100 - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]117 - [wily, ppc64el, hwe-w, generic, linux-generic-lts-wily, *sa_hwe_w]
101 - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]118 - [xenial, amd64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
102 - [xenial, amd64, hwe-x, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]119 - [xenial, amd64, hwe-x, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x_old]
103 - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]120 - [xenial, arm64, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
104 - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]121 - [xenial, armhf, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
105 - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]122 - [xenial, i386, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
106 - [xenial, i386, hwe-x, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x]123 - [xenial, i386, hwe-x, lowlatency, linux-image-lowlatency-lts-xenial, *sa_hwe_x_old]
107 - [xenial, ppc64el, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x]124 - [xenial, ppc64el, hwe-x, generic, linux-generic-lts-xenial, *sa_hwe_x_old]
108 - version: "12.04"125 - version: "12.04"
109 release: precise126 release: precise
110 builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'}127 builtin_kernel: {armhf: linux-highbank, default: 'linux-generic'}

Subscribers

People subscribed via source and target branches