maas-images

Merge lp:~andreserl/maas-images/zesty_v2_v3 into lp:maas-images

  1. zesty_v2_v3
  2. Merge into maas-ephemerals
Proposed by Andres Rodriguez
Status: Merged
Merged at revision: 345
Proposed branch: lp:~andreserl/maas-images/zesty_v2_v3
Merge into: lp:maas-images
Diff against target: 49 lines (+15/-0)
2 files modified
conf/meph-v2.yaml (+14/-0)
conf/meph-v3.yaml (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas-images/zesty_v2_v3
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+309499@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'conf/meph-v2.yaml'
2--- conf/meph-v2.yaml 2016-10-06 20:23:41 +0000
3+++ conf/meph-v2.yaml 2016-10-27 16:33:25 +0000
4@@ -22,12 +22,14 @@
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, hwe-x]
7 - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
8+ - &sa_hwe_z [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z]
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 - &arm_hwe_w [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w]
13 - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
14 - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
15+ - &arm_hwe_z [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z]
16
17 misc:
18 - &glpae generic-lpae
19@@ -38,6 +40,18 @@
20 - &kh-xgene {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
21
22 releases:
23+ - version: "17.04"
24+ release: zesty
25+ kernels:
26+ - [zesty, amd64, hwe-z, generic, linux-generic, *sa_hwe_z]
27+ - [zesty, arm64, hwe-z, generic, linux-generic, *sa_hwe_z]
28+ - [zesty, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
29+ - [zesty, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
30+ - [zesty, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
31+ - [zesty, armhf, hwe-z, generic, linux-generic, *arm_hwe_z]
32+ - [zesty, i386, hwe-z, generic, linux-generic, *sa_hwe_z]
33+ - [zesty, ppc64el, hwe-z, generic, linux-generic, *sa_hwe_z]
34+ - [zesty, s390x, hwe-z, generic, linux-generic, *sa_hwe_z]
35 - version: "16.10"
36 release: yakkety
37 kernels:
38
39=== modified file 'conf/meph-v3.yaml'
40--- conf/meph-v3.yaml 2016-10-27 16:01:59 +0000
41+++ conf/meph-v3.yaml 2016-10-27 16:33:25 +0000
42@@ -27,6 +27,7 @@
43 - &sa_hwe_x [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04]
44 - &sa_hwe_x_legacy [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
45 - &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]
46+ - &sa_hwe_z [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10, ga-17.04]
47 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
48 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
49 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]

Subscribers

People subscribed via source and target branches