Merge "Enable focal and ussuri as part of the gate tests"

src/metadata.yaml

@@ -15,6 +15,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
   - trusty
 subordinate: false
 provides:

src/tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,78 @@
+series: bionic
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+  '3':
+  '4':
+  '5':
+  '6':
+
+applications:
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '6'
+  percona-cluster:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    to:
+    - '0'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '1'
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+    - '2'
+  designate-bind:
+    charm: cs:~openstack-charmers-next/designate-bind
+    num_units: 1
+    to:
+    - '3'
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    to:
+    - '4'
+  designate:
+    charm: ../../../designate
+    num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '5'
+
+relations:
+- - 'designate:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'designate:amqp'
+  - 'rabbitmq-server:amqp'
+- - 'designate:identity-service'
+  - 'keystone:identity-service'
+- - 'keystone:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'designate:dns-backend'
+  - 'designate-bind:dns-backend'
+- - 'designate:coordinator-memcached'
+  - 'memcached:cache'
+- - 'designate:dnsaas'
+  - 'neutron-api:external-dns'
+- - 'neutron-api:identity-service'
+  - 'keystone:identity-service'
+- - 'neutron-api:shared-db'
+  - 'percona-cluster:shared-db'
+- - 'neutron-api:amqp'
+  - 'rabbitmq-server:amqp'

src/tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,126 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: focal
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+  '7':
+    series: bionic
+  '8':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  designate-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'
+
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+    - '3'
+
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+    - '4'
+
+  neutron-api:
+    charm: cs:~openstack-charmers-next/neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      openstack-origin: *openstack-origin
+    to:
+    - '5'
+
+  designate-bind:
+    charm: cs:~openstack-charmers-next/designate-bind
+    num_units: 1
+    # NOTE(ajkavanagh) apparently it has no openstack origin!
+    #options:
+      #openstack-origin: *openstack-origin
+    to:
+    - '6'
+
+  memcached:
+    charm: cs:~memcached-team/memcached
+    num_units: 1
+    # holding charm at bionic as it isn't available for focal yet
+    series: bionic
+    to:
+    - '7'
+
+  designate:
+    charm: ../../../designate
+    num_units: 1
+    options:
+      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
+      openstack-origin: *openstack-origin
+    to:
+    - '8'
+
+relations:
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:shared-db'
+    - 'designate-mysql-router:shared-db'
+  - - 'designate-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'designate:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'designate:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'designate:dns-backend'
+    - 'designate-bind:dns-backend'
+
+  - - 'designate:coordinator-memcached'
+    - 'memcached:cache'
+
+  - - 'designate:dnsaas'
+    - 'neutron-api:external-dns'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - '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'

src/tests/tests.yaml

@@ -1,21 +1,27 @@
 charm_name: designate
 
 smoke_bundles:
-  - bionic_train
+  - bionic-train
 
 gate_bundles:
-  - trusty_mitaka
-  - xenial_mitaka
-  - xenial_ocata
-  - xenial_pike
-  - xenial_queens
-  - bionic_queens
-  - bionic_rocky
-  - bionic_stein
-  - bionic_train
+  - trusty-mitaka
+  - xenial-mitaka
+  - xenial-ocata
+  - xenial-pike
+  - xenial-queens
+  - bionic-queens
+  - bionic-rocky
+  - bionic-stein
+  - bionic-train
+  - bionic-ussuri
+  - focal-ussuri
 
 dev_bundles:
-  - bionic_train
+  - bionic-train
 
 tests:
-  - zaza.openstack.charm_tests.designate.tests.DesignateTests
+  - zaza.openstack.charm_tests.designate.tests.DesignateTests
+
+tests_options:
+  force_deploy:
+    - focal-ussuri