Enable focal and ussuri testing for gate

This adds bundles for:

 * bionic-ussuri
 * focal-ussuri

And adds a force option of the focal-ussuri bundle as it is not yet
officially supported by Juju.

Change-Id: Ic0f82df6f1dc76cdba21f23e8b04ff9e12f32181

src/metadata.yaml

@@ -13,6 +13,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
 subordinate: false
 requires:
   ceph-mds:

src/reactive/ceph_fs.py

@@ -28,6 +28,8 @@ from charmhelpers.core.hookenv import (
     network_get_primary_address, relation_ids,
     status_set)
 from charmhelpers.core.host import (
+    CompareHostReleases,
+    lsb_release,
     service_restart,
     service)
 from charmhelpers.contrib.network.ip import (
@@ -42,6 +44,7 @@ import jinja2
 from charms.apt import queue_install, add_source
 
 PACKAGES = ['ceph', 'gdisk', 'ntp', 'btrfs-tools', 'xfsprogs']
+PACKAGES_FOCAL = ['ceph', 'gdisk', 'ntp', 'btrfs-progs', 'xfsprogs']
 
 TEMPLATES_DIR = 'templates'
 VERSION_PACKAGE = 'ceph-common'
@@ -57,7 +60,11 @@ def render_template(template_name, context, template_dir=TEMPLATES_DIR):
 @when_not('apt.installed.ceph')
 def install_ceph_base():
     add_source(config('source'), key=config('key'))
-    queue_install(PACKAGES)
+    release = lsb_release()['DISTRIB_CODENAME'].lower()
+    if CompareHostReleases(release) >= 'focal':
+        queue_install(PACKAGES_FOCAL)
+    else:
+        queue_install(PACKAGES)
 
 
 @when_not('apt.installed.ceph-mds')
@@ -281,4 +288,7 @@ def pre_series_upgrade():
 def post_series_upgrade():
     """Handler for post-series-upgrade.
     """
+    release = lsb_release()['DISTRIB_CODENAME'].lower()
+    if CompareHostReleases(release) >= 'focal':
+        queue_install(PACKAGES_FOCAL)
     unitdata.kv().set('charm.vault.series-upgrading', False)

src/tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,139 @@
+series: bionic
+applications:
+  ceph-fs:
+    charm: ceph-fs
+    num_units: 1
+    options:
+      source: cloud:bionic-ussuri
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      osd-devices: '/dev/test-non-existent'
+      source: cloud:bionic-ussuri
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      monitor-count: '3'
+      source: cloud:bionic-ussuri
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    options:
+      dataset-size: 25%
+      max-connections: 1000
+      source: cloud:bionic-ussuri
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: cloud:bionic-ussuri
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  nova-cloud-controller:
+    expose: True
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: cloud:bionic-ussuri
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    constraints: mem=8G
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: cloud:bionic-ussuri
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      neutron-plugin: ovs
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: cloud:bionic-ussuri
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      openstack-origin: cloud:bionic-ussuri
+relations:
+- - 'ceph-mon:mds'
+  - 'ceph-fs:ceph-mds'
+- - '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'
+- - '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'
+- - 'placement'
+  - 'percona-cluster'
+- - 'placement'
+  - 'keystone'
+- - 'placement'
+  - 'nova-cloud-controller'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'neutron-api:neutron-api'
+  - 'nova-cloud-controller:neutron-api'
+- - 'neutron-api:neutron-plugin-api'
+  - 'neutron-gateway:neutron-plugin-api'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'nova-compute:neutron-plugin'
+  - 'neutron-openvswitch:neutron-plugin'
+- - 'neutron-gateway:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'neutron-openvswitch:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'nova-cloud-controller:quantum-network-service'
+  - 'neutron-gateway:quantum-network-service'

src/tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,219 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: &series focal
+
+machines:
+  '0':
+    constraints: "mem=3072M"
+  '1':
+    constraints: "mem=3072M"
+  '2':
+    constraints: "mem=3072M"
+  '3':
+
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  nova-cloud-controller-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  placement-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  neutron-api-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  ceph-fs:
+    charm: ceph-fs
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '3'
+
+  ceph-osd:
+    charm: cs:~openstack-charmers-next/ceph-osd
+    num_units: 3
+    storage:
+      osd-devices: 'cinder,10G'
+    options:
+      osd-devices: '/dev/test-non-existent'
+      source: *openstack-origin
+
+  ceph-mon:
+    charm: cs:~openstack-charmers-next/ceph-mon
+    num_units: 3
+    options:
+      monitor-count: '3'
+      source: *openstack-origin
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  nova-cloud-controller:
+    expose: True
+    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+
+  nova-compute:
+    charm: cs:~openstack-charmers-next/nova-compute
+    num_units: 2
+    constraints: mem=8G
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+
+  placement:
+    charm: cs:~openstack-charmers-next/placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      neutron-plugin: ovs
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+
+  neutron-openvswitch:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+
+  neutron-gateway:
+    charm: cs:~openstack-charmers-next/neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      openstack-origin: *openstack-origin
+
+relations:
+
+  - - 'ceph-mon:mds'
+    - 'ceph-fs:ceph-mds'
+
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-compute:ceph'
+    - 'ceph-mon:client'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'glance:ceph'
+    - 'ceph-mon:client'
+
+  - - 'ceph-osd:mon'
+    - 'ceph-mon:osd'
+
+  - - 'nova-cloud-controller:shared-db'
+    - 'nova-cloud-controller-mysql-router:shared-db'
+  - - 'nova-cloud-controller-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - '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'
+
+  - - 'placement:shared-db'
+    - 'placement-mysql-router:shared-db'
+  - - 'placement-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'placement'
+    - 'keystone'
+
+  - - 'placement'
+    - 'nova-cloud-controller'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-api:neutron-api'
+    - 'nova-cloud-controller:neutron-api'
+
+  - - 'neutron-api:neutron-plugin-api'
+    - 'neutron-gateway:neutron-plugin-api'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'

src/tests/tests.yaml

@@ -1,5 +1,7 @@
 charm_name: ceph-fs
 gate_bundles:
+  - focal-ussuri
+  - bionic-ussuri
   - bionic-train
   - bionic-stein
   - bionic-rocky
@@ -12,7 +14,7 @@ gate_bundles:
 smoke_bundles:
   - bionic-stein
 dev_bundles:
-  - eoan-train
+  - bionic-train
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_lts_image
   - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
@@ -21,3 +23,6 @@ configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 tests:
   - zaza.openstack.charm_tests.ceph.fs.tests.CephFSTests
+tests_options:
+  force_deploy:
+    - focal-ussuri