maas-images

Merge ~adam-collard/maas-images:disco-is-dead into maas-images:master

  1. Git
  2. lp:~adam-collard/maas-images
  3. disco-is-dead
  4. Merge into master
Proposed by Adam Collard
Status: Merged
Approved by: Adam Collard
Approved revision: c8f3143e6e920e61519fe8fc3bcaf92e14ae6e95
Merged at revision: c8f3143e6e920e61519fe8fc3bcaf92e14ae6e95
Proposed branch: ~adam-collard/maas-images:disco-is-dead
Merge into: maas-images:master
Diff against target: 74 lines (+0/-34)
2 files modified
conf/meph-v2.yaml (+0/-12)
conf/meph-v3.yaml (+0/-22)
Reviewer Review Type Date Requested Status
Alberto Donato (community) Approve
Review via email: mp+382304@code.launchpad.net

Commit message

Remove Disco (unsupported)

To post a comment you must log in.
Revision history for this message
Alberto Donato (ack) wrote :

+1

review: Approve
Revision history for this message
Alberto Donato (ack) wrote :

still +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/conf/meph-v2.yaml b/conf/meph-v2.yaml
2index eadc1ab..8b48811 100644
3--- a/conf/meph-v2.yaml
4+++ b/conf/meph-v2.yaml
5@@ -62,18 +62,6 @@ releases:
6 - [eoan, i386, hwe-e, generic, linux-generic, *sa_hwe_e]
7 - [eoan, ppc64el, hwe-e, generic, linux-generic, *sa_hwe_e]
8 - [eoan, s390x, hwe-e, generic, linux-generic, *sa_hwe_e]
9- - version: "19.04"
10- release: disco
11- kernels:
12- - [disco, amd64, hwe-d, generic, linux-generic, *sa_hwe_d]
13- - [disco, arm64, hwe-d, generic, linux-generic, *sa_hwe_d]
14- - [disco, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
15- - [disco, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
16- - [disco, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
17- - [disco, armhf, hwe-d, generic, linux-generic, *arm_hwe_d]
18- - [disco, i386, hwe-d, generic, linux-generic, *sa_hwe_d]
19- - [disco, ppc64el, hwe-d, generic, linux-generic, *sa_hwe_d]
20- - [disco, s390x, hwe-d, generic, linux-generic, *sa_hwe_d]
21 - version: "18.04"
22 release: bionic
23 kernels:
24diff --git a/conf/meph-v3.yaml b/conf/meph-v3.yaml
25index d0b7845..e912713 100644
26--- a/conf/meph-v3.yaml
27+++ b/conf/meph-v3.yaml
28@@ -28,12 +28,8 @@ subarches:
29 - &sa_hwe_x_edge [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, hwe-16.04, hwe-16.10, hwe-17.04, hwe-17.10, hwe-18.04]
30 - &sa_hwe_x_legacy [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
31 - &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]
32- - &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]
33- - &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]
34 - &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]
35 - &sa_hwe_b_edge [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, hwe-18.10, hwe-19.04]
36- - &sa_hwe_cc [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, ga-18.10]
37- - &sa_hwe_dd [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, ga-18.10, ga-19.04]
38 - &sa_hwe_ee [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, ga-18.10, ga-19.04, ga-19.10]
39 - &sa_hwe_ff [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, ga-18.10, ga-19.04, ga-19.10, ga-20.04]
40 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
41@@ -43,12 +39,8 @@ subarches:
42 - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04]
43 - &arm_hwe_x_edge [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04, hwe-16.04, hwe-16.10, hwe-17.04, hwe-17.10, hwe-18.04]
44 - &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]
45- - &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]
46- - &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]
47 - &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]
48 - &arm_hwe_b_edge [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, hwe-18.10, hwe-19.04]
49- - &arm_hwe_cc [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, ga-18.10]
50- - &arm_hwe_dd [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, ga-18.10, ga-19.04]
51 - &arm_hwe_ee [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, ga-18.10, ga-19.04, ga-19.10]
52 - &arm_hwe_ff [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, ga-18.10, ga-19.04, ga-19.10, ga-20.04]
53
54@@ -89,20 +81,6 @@ releases:
55 - [eoan, i386, ga-19.10, lowlatency, linux-image-lowlatency, *sa_hwe_ee]
56 - [eoan, ppc64el, ga-19.10, generic, linux-generic, *sa_hwe_ee]
57 - [eoan, s390x, ga-19.10, generic, linux-generic, *sa_hwe_ee]
58- - version: "19.04"
59- release: disco
60- kernels:
61- - [disco, amd64, ga-19.04, generic, linux-generic, *sa_hwe_dd]
62- - [disco, amd64, ga-19.04, lowlatency, linux-image-lowlatency, *sa_hwe_dd]
63- - [disco, arm64, ga-19.04, generic, linux-generic, *sa_hwe_dd]
64- - [disco, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
65- - [disco, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
66- - [disco, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
67- - [disco, armhf, ga-19.04, generic, linux-generic, *arm_hwe_dd]
68- - [disco, i386, ga-19.04, generic, linux-generic, *sa_hwe_dd]
69- - [disco, i386, ga-19.04, lowlatency, linux-image-lowlatency, *sa_hwe_dd]
70- - [disco, ppc64el, ga-19.04, generic, linux-generic, *sa_hwe_dd]
71- - [disco, s390x, ga-19.04, generic, linux-generic, *sa_hwe_dd]
72 - version: "18.04"
73 release: bionic
74 kernels:

Subscribers

People subscribed via source and target branches