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
diff --git a/conf/meph-v2.yaml b/conf/meph-v2.yaml
index eadc1ab..8b48811 100644
--- a/conf/meph-v2.yaml
+++ b/conf/meph-v2.yaml
@@ -62,18 +62,6 @@ releases:
62 - [eoan, i386, hwe-e, generic, linux-generic, *sa_hwe_e]62 - [eoan, i386, hwe-e, generic, linux-generic, *sa_hwe_e]
63 - [eoan, ppc64el, hwe-e, generic, linux-generic, *sa_hwe_e]63 - [eoan, ppc64el, hwe-e, generic, linux-generic, *sa_hwe_e]
64 - [eoan, s390x, hwe-e, generic, linux-generic, *sa_hwe_e]64 - [eoan, s390x, hwe-e, generic, linux-generic, *sa_hwe_e]
65 - version: "19.04"
66 release: disco
67 kernels:
68 - [disco, amd64, hwe-d, generic, linux-generic, *sa_hwe_d]
69 - [disco, arm64, hwe-d, generic, linux-generic, *sa_hwe_d]
70 - [disco, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
71 - [disco, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
72 - [disco, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
73 - [disco, armhf, hwe-d, generic, linux-generic, *arm_hwe_d]
74 - [disco, i386, hwe-d, generic, linux-generic, *sa_hwe_d]
75 - [disco, ppc64el, hwe-d, generic, linux-generic, *sa_hwe_d]
76 - [disco, s390x, hwe-d, generic, linux-generic, *sa_hwe_d]
77 - version: "18.04"65 - version: "18.04"
78 release: bionic66 release: bionic
79 kernels:67 kernels:
diff --git a/conf/meph-v3.yaml b/conf/meph-v3.yaml
index d0b7845..e912713 100644
--- a/conf/meph-v3.yaml
+++ b/conf/meph-v3.yaml
@@ -28,12 +28,8 @@ subarches:
28 - &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]28 - &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]
29 - &sa_hwe_x_legacy [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]29 - &sa_hwe_x_legacy [generic, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, hwe-x]
30 - &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]30 - &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]
31 - &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]
32 - &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]
33 - &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]31 - &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]
34 - &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]32 - &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]
35 - &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]
36 - &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]
37 - &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]33 - &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]
38 - &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]34 - &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]
39 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]35 - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
@@ -43,12 +39,8 @@ subarches:
43 - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04]39 - &arm_hwe_x [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v, hwe-w, ga-16.04]
44 - &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]40 - &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]
45 - &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]41 - &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]
46 - &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]
47 - &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]
48 - &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]42 - &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]
49 - &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]43 - &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]
50 - &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]
51 - &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]
52 - &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]44 - &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]
53 - &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]45 - &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]
5446
@@ -89,20 +81,6 @@ releases:
89 - [eoan, i386, ga-19.10, lowlatency, linux-image-lowlatency, *sa_hwe_ee]81 - [eoan, i386, ga-19.10, lowlatency, linux-image-lowlatency, *sa_hwe_ee]
90 - [eoan, ppc64el, ga-19.10, generic, linux-generic, *sa_hwe_ee]82 - [eoan, ppc64el, ga-19.10, generic, linux-generic, *sa_hwe_ee]
91 - [eoan, s390x, ga-19.10, generic, linux-generic, *sa_hwe_ee]83 - [eoan, s390x, ga-19.10, generic, linux-generic, *sa_hwe_ee]
92 - version: "19.04"
93 release: disco
94 kernels:
95 - [disco, amd64, ga-19.04, generic, linux-generic, *sa_hwe_dd]
96 - [disco, amd64, ga-19.04, lowlatency, linux-image-lowlatency, *sa_hwe_dd]
97 - [disco, arm64, ga-19.04, generic, linux-generic, *sa_hwe_dd]
98 - [disco, arm64, *mustang, generic, linux-generic, [*mustang], *kh-mustang]
99 - [disco, arm64, *xguboot, generic, linux-generic, [*xguboot], *kh-xgene]
100 - [disco, armhf, *glpae, *glpae, linux-generic-lpae, [*glpae]]
101 - [disco, armhf, ga-19.04, generic, linux-generic, *arm_hwe_dd]
102 - [disco, i386, ga-19.04, generic, linux-generic, *sa_hwe_dd]
103 - [disco, i386, ga-19.04, lowlatency, linux-image-lowlatency, *sa_hwe_dd]
104 - [disco, ppc64el, ga-19.04, generic, linux-generic, *sa_hwe_dd]
105 - [disco, s390x, ga-19.04, generic, linux-generic, *sa_hwe_dd]
106 - version: "18.04"84 - version: "18.04"
107 release: bionic85 release: bionic
108 kernels:86 kernels:

Subscribers

People subscribed via source and target branches