Merge "Add focal-ussuri and bionic-ussuri bundle"

metadata.yaml

@@ -13,6 +13,7 @@ series:
   - xenial
   - bionic
   - eoan
+  - focal
   - trusty
 extra-bindings:
   public:

tests/bundles/bionic-ussuri.yaml

@@ -0,0 +1,40 @@
+series: bionic
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+  '3':
+  '4':
+relations:
+- - keystone:shared-db
+  - mysql:shared-db
+- - glance:shared-db
+  - mysql:shared-db
+- - glance:identity-service
+  - keystone:identity-service
+applications:
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    to:
+    - '0'
+  keystone:
+    charm: ../../../keystone
+    num_units: 3
+    options:
+      openstack-origin: cloud:bionic-ussuri
+      token-expiration: 60
+    to:
+    - '1'
+    - '2'
+    - '3'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: cloud:bionic-ussuri
+    to:
+    - '4'

tests/bundles/focal-ussuri.yaml

@@ -0,0 +1,52 @@
+series: focal
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+  '6':
+relations:
+- - keystone:shared-db
+  - keystone-mysql-router:shared-db
+- - glance:shared-db
+  - glance-mysql-router:shared-db
+- - glance:identity-service
+  - keystone:identity-service
+- - glance-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+- - keystone-mysql-router:db-router
+  - mysql-innodb-cluster:db-router
+applications:
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    to:
+      - '0'
+      - '1'
+      - '2'
+  keystone:
+    charm: ../../../keystone
+    num_units: 3
+    options:
+      token-provider: 'fernet'
+      token-expiration: 60
+    to:
+    - '3'
+    - '4'
+    - '5'
+  glance:
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    to:
+    - '6'

tests/tests.yaml

@@ -2,6 +2,8 @@ charm_name: keystone
 smoke_bundles:
 - bionic-train
 gate_bundles:
+- focal-ussuri
+- bionic-ussuri
 - bionic-train
 - bionic-stein
 - bionic-rocky
@@ -11,6 +13,8 @@ gate_bundles:
 - xenial-ocata
 - xenial-mitaka
 - trusty-mitaka
+dev_bundles:
+- focal-ussuri
 comment: |
   the glance configure job validates operation of identity-service relation.
   The policyd test is generic and validates the policy.d overrides work
@@ -25,3 +29,5 @@ tests:
 tests_options:
   policyd:
     service: keystone
+  force_deploy:
+    - focal-ussuri