Enable bionic/stein and disco/stein functional tests

Also fixes the bionic/rocky and cosmic/rocy bundles.

Move cosmic/rocky and disco/stein to dev_bundles.

Change-Id: I77b6aa2b5fba921c4735a86028e9e7c8b09ff40a

tests/bundles/bionic-rocky.yaml

@@ -8,43 +8,43 @@ applications:
       osd-devices: 'cinder,10G'
     options:
       osd-devices: '/srv/ceph /dev/test-non-existent'
-      source: cloud:bionic-updates/rocky
+      source: cloud:bionic-rocky
   ceph-mon:
     charm: cs:~openstack-charmers-next/ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
-      source: cloud:bionic-updates/rocky
+      source: cloud:bionic-rocky
   percona-cluster:
     charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
     options:
       dataset-size: 25%
       max-connections: 1000
-      source: cloud:bionic-updates/rocky
+      source: cloud:bionic-rocky
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
     options:
-      source: cloud:bionic-updates/rocky
+      source: cloud:bionic-rocky
   keystone:
     expose: True
     charm: cs:~openstack-charmers-next/keystone
     num_units: 1
     options:
-      openstack-origin: cloud:bionic-rocky/proposed
+      openstack-origin: cloud:bionic-rocky
   nova-compute:
     charm: cs:~openstack-charmers-next/nova-compute
     num_units: 1
     options:
-      openstack-origin: cloud:bionic-rocky/proposed
+      openstack-origin: cloud:bionic-rocky
   glance:
     expose: True
     charm: cs:~openstack-charmers-next/glance
     num_units: 1
     options:
-      openstack-origin: cloud:bionic-rocky/proposed
+      openstack-origin: cloud:bionic-rocky
   cinder:
     expose: True
     charm: cs:~openstack-charmers-next/cinder
@@ -52,7 +52,7 @@ applications:
     options:
       block-device: 'None'
       glance-api-version: '2'
-      openstack-origin: cloud:bionic-rocky/proposed
+      openstack-origin: cloud:bionic-rocky
   cinder-ceph:
     charm: cs:~openstack-charmers-next/cinder-ceph
   nova-cloud-controller:
@@ -60,7 +60,7 @@ applications:
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
     options:
-      openstack-origin: cloud:bionic-rocky/proposed
+      openstack-origin: cloud:bionic-rocky
 relations:
 - - nova-compute:amqp
   - rabbitmq-server:amqp

tests/bundles/bionic-stein.yaml

@@ -0,0 +1,104 @@
+series: bionic
+applications:
+  ceph-osd:
+    charm: ceph-osd
+    num_units: 3
+    series: bionic
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      osd-devices: '/srv/ceph /dev/test-non-existent'
+      source: cloud:bionic-stein
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      monitor-count: '3'
+      auth-supported: 'none'
+      source: cloud:bionic-stein
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      dataset-size: 25%
+      max-connections: 1000
+      source: cloud:bionic-stein
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: cloud:bionic-stein
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+  cinder:
+    expose: True
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      block-device: 'None'
+      glance-api-version: '2'
+      openstack-origin: cloud:bionic-stein
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
+  nova-cloud-controller:
+    expose: True
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-stein
+relations:
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+- - nova-compute:image-service
+  - glance:image-service
+- - nova-compute:ceph
+  - ceph-mon:client
+- - keystone:shared-db
+  - percona-cluster:shared-db
+- - glance:shared-db
+  - percona-cluster:shared-db
+- - glance:identity-service
+  - keystone:identity-service
+- - glance:amqp
+  - rabbitmq-server:amqp
+- - glance:ceph
+  - ceph-mon:client
+- - cinder:shared-db
+  - percona-cluster:shared-db
+- - cinder:identity-service
+  - keystone:identity-service
+- - cinder:amqp
+  - rabbitmq-server:amqp
+- - cinder:image-service
+  - glance:image-service
+- - cinder-ceph:storage-backend
+  - cinder:storage-backend
+- - cinder-ceph:ceph
+  - ceph-mon:client
+- - ceph-osd:mon
+  - ceph-mon:osd
+- - nova-cloud-controller:shared-db
+  - percona-cluster:shared-db
+- - nova-cloud-controller:identity-service
+  - keystone:identity-service
+- - nova-cloud-controller:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:cloud-compute
+  - nova-compute:cloud-compute
+- - nova-cloud-controller:image-service
+  - glance:image-service

tests/bundles/cosmic-rocky.yaml

@@ -1,9 +1,9 @@
 series: cosmic
 applications:
   ceph-osd:
+    series: cosmic
     charm: ceph-osd
     num_units: 3
-    series: cosmic
     storage:
       osd-devices: 'cinder,10G'
     options:
@@ -27,19 +27,13 @@ applications:
     expose: True
     charm: cs:~openstack-charmers-next/keystone
     num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky/proposed
   nova-compute:
     charm: cs:~openstack-charmers-next/nova-compute
     num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky/proposed
   glance:
     expose: True
     charm: cs:~openstack-charmers-next/glance
     num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky/proposed
   cinder:
     expose: True
     charm: cs:~openstack-charmers-next/cinder
@@ -47,15 +41,12 @@ applications:
     options:
       block-device: 'None'
       glance-api-version: '2'
-      openstack-origin: cloud:bionic-rocky/proposed
   cinder-ceph:
     charm: cs:~openstack-charmers-next/cinder-ceph
   nova-cloud-controller:
     expose: True
     charm: cs:~openstack-charmers-next/nova-cloud-controller
     num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky/proposed
 relations:
 - - nova-compute:amqp
   - rabbitmq-server:amqp

tests/bundles/disco-stein.yaml

@@ -0,0 +1,90 @@
+series: disco
+applications:
+  ceph-osd:
+    series: disco
+    charm: ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      osd-devices: '/srv/ceph /dev/test-non-existent'
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      monitor-count: '3'
+      auth-supported: 'none'
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      dataset-size: 25%
+      max-connections: 1000
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 1
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+  cinder:
+    expose: True
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      block-device: 'None'
+      glance-api-version: '2'
+  cinder-ceph:
+    charm: cs:~openstack-charmers-next/cinder-ceph
+  nova-cloud-controller:
+    expose: True
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+relations:
+- - nova-compute:amqp
+  - rabbitmq-server:amqp
+- - nova-compute:image-service
+  - glance:image-service
+- - nova-compute:ceph
+  - ceph-mon:client
+- - keystone:shared-db
+  - percona-cluster:shared-db
+- - glance:shared-db
+  - percona-cluster:shared-db
+- - glance:identity-service
+  - keystone:identity-service
+- - glance:amqp
+  - rabbitmq-server:amqp
+- - glance:ceph
+  - ceph-mon:client
+- - cinder:shared-db
+  - percona-cluster:shared-db
+- - cinder:identity-service
+  - keystone:identity-service
+- - cinder:amqp
+  - rabbitmq-server:amqp
+- - cinder:image-service
+  - glance:image-service
+- - cinder-ceph:storage-backend
+  - cinder:storage-backend
+- - cinder-ceph:ceph
+  - ceph-mon:client
+- - ceph-osd:mon
+  - ceph-mon:osd
+- - nova-cloud-controller:shared-db
+  - percona-cluster:shared-db
+- - nova-cloud-controller:identity-service
+  - keystone:identity-service
+- - nova-cloud-controller:amqp
+  - rabbitmq-server:amqp
+- - nova-cloud-controller:cloud-compute
+  - nova-compute:cloud-compute
+- - nova-cloud-controller:image-service
+  - glance:image-service

tests/tests.yaml

@@ -1,16 +1,18 @@
 charm_name: ceph-osd
 gate_bundles:
-  - trusty-mitaka
-  - xenial-mitaka
-  - xenial-ocata
-  - xenial-pike
-  - xenial-queens
+  - bionic-stein
+  - bionic-rocky
   - bionic-queens
+  - xenial-queens
+  - xenial-pike
+  - xenial-ocata
+  - xenial-mitaka
+  - trusty-mitaka
 smoke_bundles:
   - bionic-queens
 dev_bundles:
-  - bionic-rocky
   - cosmic-rocky
+  - disco-stein
 configure:
   - zaza.charm_tests.glance.setup.add_lts_image
 tests: