Merge lp:~smoser/maas-images/trunk.bionic into lp:maas-images

Proposed by Scott Moser
Status: Merged
Merged at revision: 384
Proposed branch: lp:~smoser/maas-images/trunk.bionic
Merge into: lp:maas-images
Diff against target: 102 lines (+31/-11)
3 files modified
conf/meph-v2.yaml (+14/-0)
conf/meph-v3.yaml (+16/-0)
system-setup (+1/-11)
To merge this branch: bzr merge lp:~smoser/maas-images/trunk.bionic
Reviewer Review Type Date Requested Status
Dan Watkins (community) Approve
maintainers of maas images Pending
Review via email: mp+334144@code.launchpad.net

Description of the change

enable bionic

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

LGTM.

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 2017-05-03 10:29:59 +0000
3+++ conf/meph-v2.yaml 2017-11-22 20:19:00 +0000
4@@ -24,6 +24,7 @@
5 - &sa_hwe_y [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y]
6 - &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]
7 - &sa_hwe_a [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a]
8+ - &sa_hwe_b [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a, hwe-b]
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@@ -32,6 +33,7 @@
13 - &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]
14 - &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]
15 - &arm_hwe_a [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a]
16+ - &arm_hwe_b [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x, hwe-y, hwe-z, hwe-a, hwe-b]
17
18 misc:
19 - &glpae generic-lpae
20@@ -42,6 +44,18 @@
21 - &kh-xgene {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
22
23 releases:
24+ - version: "18.04"
25+ release: bionic
26+ kernels:
27+ - [bionic, amd64, hwe-b, generic, linux-generic, *sa_hwe_b]
28+ - [bionic, arm64, hwe-b, generic, linux-generic, *sa_hwe_b]
29+ - [bionic, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
30+ - [bionic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
31+ - [bionic, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
32+ - [bionic, armhf, hwe-b, generic, linux-generic, *arm_hwe_b]
33+ - [bionic, i386, hwe-b, generic, linux-generic, *sa_hwe_b]
34+ - [bionic, ppc64el, hwe-b, generic, linux-generic, *sa_hwe_b]
35+ - [bionic, s390x, hwe-b, generic, linux-generic, *sa_hwe_b]
36 - version: "17.10"
37 release: artful
38 kernels:
39
40=== modified file 'conf/meph-v3.yaml'
41--- conf/meph-v3.yaml 2017-05-03 10:29:59 +0000
42+++ conf/meph-v3.yaml 2017-11-22 20:19:00 +0000
43@@ -30,6 +30,7 @@
44 - &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]
45 - &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]
46 - &sa_hwe_a [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, ga-17.10]
47+ - &sa_hwe_b [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, ga-17.10, ga-18.04]
48 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
49 - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
50 - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
51@@ -39,6 +40,7 @@
52 - &arm_hwe_y [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, ga-16.10]
53 - &arm_hwe_z [generic, highbank, 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]
54 - &arm_hwe_a [generic, highbank, 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, ga-17.10]
55+ - &arm_hwe_b [generic, highbank, 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, ga-17.10, ga-18.04]
56
57 misc:
58 - &glpae generic-lpae
59@@ -49,6 +51,20 @@
60 - &kh-xgene {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
61
62 releases:
63+ - version: "18.04"
64+ release: bionic
65+ kernels:
66+ - [bionic, amd64, ga-18.04, generic, linux-generic, *sa_hwe_b]
67+ - [bionic, amd64, ga-18.04, lowlatency, linux-image-lowlatency, *sa_hwe_b]
68+ - [bionic, arm64, ga-18.04, generic, linux-generic, *sa_hwe_b]
69+ - [bionic, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
70+ - [bionic, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
71+ - [bionic, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
72+ - [bionic, armhf, ga-18.04, generic, linux-generic, *arm_hwe_b]
73+ - [bionic, i386, ga-18.04, generic, linux-generic, *sa_hwe_b]
74+ - [bionic, i386, ga-18.04, lowlatency, linux-image-lowlatency, *sa_hwe_b]
75+ - [bionic, ppc64el, ga-18.04, generic, linux-generic, *sa_hwe_b]
76+ - [bionic, s390x, ga-18.04, generic, linux-generic, *sa_hwe_b]
77 - version: "17.10"
78 release: artful
79 kernels:
80
81=== modified file 'system-setup'
82--- system-setup 2016-08-01 19:14:10 +0000
83+++ system-setup 2017-11-22 20:19:00 +0000
84@@ -76,17 +76,7 @@
85
86
87 streams_package=true
88-if [[ "$rel" < trusty ]]; then
89- error "# WARN: building not supported prior to trusty" 1>&2
90- error "# WARN: but meph2-util (index operations) supported" 1>&2
91- [ "${MEPH2_SIMPLESTREAMS}" = "package" ] &&
92- fail "no distro simplestreams < trusty"
93- MEPH2_SIMPLESTREAMS="auto"
94- streams_package=false
95- def_meph2_only=true
96-else
97- def_meph2_only=false
98-fi
99+def_meph2_only=false
100
101 case "$MEPH2_UTIL_ONLY" in
102 false|0) meph2_only=false;;

Subscribers

People subscribed via source and target branches