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

[Scott Moser]

add cosmic / 18.10 / Cosmic.

This just updates conf/ to know about Cosmic.

in meph-v3.yaml i've used the anchor name hwe_cc rather than hwe_c
as is becoming the standard to refer to the second time through the
ubuntu alphabet. In meph-v3.yaml, these are *only* anchors, they
have no affect on the published data.

I've left the single letter in meph-v2.yaml as they those anchors
contain things like 'hwe-z' and 'hwe-b', so I found it more straight
forward to keep those anchor names. We would expect meph-v2 to be
out of use by the time we get back to hwe-p.

This is similar to revno 383 that added bionic.

[lp:~smoser/maas-images/trunk.cosmic]

398. By Scott Moser on 2018-05-04

meph-v2: fix to give subarch as hwe-c, not hwe-cc

[Newell Jensen (newell-jensen)]

LGTM

review: Approve

=== modified file 'conf/meph-v2.yaml'
--- conf/meph-v2.yaml	2017-11-22 23:41:12 +0000
+++ conf/meph-v2.yaml	2018-05-04 17:33:26 +0000
@@ -25,6 +25,7 @@
  - &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]
  - &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]
  - &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]
+ - &sa_hwe_c  [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, hwe-c]
  - &arm_hwe_t [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
  - &arm_hwe_u [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
  - &arm_hwe_v [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
@@ -34,6 +35,7 @@
  - &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]
  - &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]
  - &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]
+ - &arm_hwe_c [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, hwe-c]
 
 misc:
  - &glpae generic-lpae
@@ -44,6 +46,18 @@
  - &kh-xgene   {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
 
 releases:
+ - version: "18.10"
+   release: cosmic
+   kernels:
+    - [bionic,  amd64,   hwe-c,    generic,   linux-signed-generic,     *sa_hwe_c]
+    - [bionic,  arm64,   hwe-c,    generic,   linux-generic,            *sa_hwe_c]
+    - [bionic,  arm64,   *mustang, generic,   linux-generic,            [*mustang], *kh-mustang]
+    - [bionic,  arm64,   *xguboot, generic,   linux-generic,            [*xguboot], *kh-xgene]
+    - [bionic,  armhf,   *glpae,   *glpae,    linux-generic-lpae,       [*glpae]]
+    - [bionic,  armhf,   hwe-c,    generic,   linux-generic,            *arm_hwe_c]
+    - [bionic,  i386,    hwe-c,    generic,   linux-generic,            *sa_hwe_c]
+    - [bionic,  ppc64el, hwe-c,    generic,   linux-generic,            *sa_hwe_c]
+    - [bionic,  s390x,   hwe-c,    generic,   linux-generic,            *sa_hwe_c]
  - version: "18.04"
    release: bionic
    kernels:

=== modified file 'conf/meph-v3.yaml'
--- conf/meph-v3.yaml	2018-02-01 18:55:38 +0000
+++ conf/meph-v3.yaml	2018-05-04 17:33:26 +0000
@@ -31,6 +31,7 @@
  - &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]
  - &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]
  - &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]
+ - &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]
  - &arm_hwe_t       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t]
  - &arm_hwe_u       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u]
  - &arm_hwe_v       [generic, highbank, hwe-p, hwe-q, hwe-r, hwe-s, hwe-t, hwe-u, hwe-v]
@@ -41,6 +42,7 @@
  - &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]
  - &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]
  - &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]
+ - &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]
 
 misc:
  - &glpae generic-lpae
@@ -51,6 +53,20 @@
  - &kh-xgene   {suffix: .xgene, kihelper: "kh-xgene", di-format: 'xgene'}
 
 releases:
+ - version: "18.10"
+   release: cosmic
+   kernels:
+    - [cosmic,     amd64,    ga-18.10,        generic,     linux-signed-generic,                 *sa_hwe_cc]
+    - [cosmic,     amd64,    ga-18.10,        lowlatency,  linux-signed-image-lowlatency,        *sa_hwe_cc]
+    - [cosmic,     arm64,    ga-18.10,        generic,     linux-generic,                        *sa_hwe_cc]
+    - [cosmic,     arm64,    *mustang,        generic,     linux-generic,                        [*mustang], *kh-mustang]
+    - [cosmic,     arm64,    *xguboot,        generic,     linux-generic,                        [*xguboot], *kh-xgene]
+    - [cosmic,     armhf,    *glpae,          *glpae,      linux-generic-lpae,                   [*glpae]]
+    - [cosmic,     armhf,    ga-18.10,        generic,     linux-generic,                        *arm_hwe_cc]
+    - [cosmic,     i386,     ga-18.10,        generic,     linux-generic,                        *sa_hwe_cc]
+    - [cosmic,     i386,     ga-18.10,        lowlatency,  linux-image-lowlatency,               *sa_hwe_cc]
+    - [cosmic,     ppc64el,  ga-18.10,        generic,     linux-generic,                        *sa_hwe_cc]
+    - [cosmic,     s390x,    ga-18.10,        generic,     linux-generic,                        *sa_hwe_cc]
  - version: "18.04"
    release: bionic
    kernels: