Test bundles for focal-wallaby and hirsute-wallaby

These are the test bundles (and any associated changes) for
focal-wallaby and hirsute-wallaby support.

Change-Id: I97b20f0f8eaae99b2ca75e283f4a2c29be871198
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>

osci.yaml

@@ -3,7 +3,9 @@
       - charm-unit-jobs
     check:
       jobs:
+      - test-s3api-hirsute-wallaby
       - test-s3api-groovy-victoria
+      - test-s3api-focal-wallaby
       - test-s3api-focal-victoria
       - test-s3api-focal-ussuri
       - test-s3api-bionic-ussuri
@@ -13,9 +15,50 @@
       - xenial-mitaka_swift-proxy
       - bionic-train-gr_swift-proxy
 
+- job:
+    name: xenial-mitaka_swift-proxy
+    parent: xenial-mitaka
+    dependencies: &smoke-jobs
+      - test-s3api-focal-ussuri
+- job:
+    name: test-s3api-bionic-queens
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: test-s3api:bionic-queens
+- job:
+    name: test-s3api-bionic-rocky
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: test-s3api:bionic-rocky
+- job:
+    name: test-s3api-bionic-stein
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: test-s3api:bionic-stein
+- job:
+    name: test-s3api-bionic-train
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: test-s3api:bionic-train
+- job:
+    name: bionic-train-gr_swift-proxy
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: swift_gr_region1:bionic-train-gr-r1 swift_gr_region2:bionic-train-gr-r2
 - job:
     name: test-s3api-bionic-ussuri
     parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: test-s3api:bionic-ussuri
+- job:
+    name: test-s3api-focal-ussuri
+    parent: func-target
     dependencies:
       - osci-lint
       - tox-py35
@@ -23,18 +66,7 @@
       - tox-py37
       - tox-py38
     vars:
-      tox_extra_args: test-s3api:bionic-ussuri
-- job:
-    name: test-s3api-groovy-victoria
-    parent: func-target
-    dependencies: &smoke-jobs
-      - test-s3api-bionic-ussuri
-    vars:
-      tox_extra_args: test-s3api:groovy-victoria
-- job:
-    name: xenial-mitaka_swift-proxy
-    parent: xenial-mitaka
-    dependencies: *smoke-jobs
+      tox_extra_args: test-s3api:focal-ussuri
 - job:
     name: test-s3api-focal-victoria
     parent: func-target
@@ -42,38 +74,20 @@
     vars:
       tox_extra_args: test-s3api:focal-victoria
 - job:
-    name: test-s3api-focal-ussuri
+    name: test-s3api-focal-wallaby
     parent: func-target
     dependencies: *smoke-jobs
     vars:
-      tox_extra_args: test-s3api:focal-ussuri
+      tox_extra_args: test-s3api:focal-wallaby
 - job:
-    name: test-s3api-bionic-train
+    name: test-s3api-groovy-victoria
     parent: func-target
     dependencies: *smoke-jobs
     vars:
-      tox_extra_args: test-s3api:bionic-train
+      tox_extra_args: test-s3api:groovy-victoria
 - job:
-    name: test-s3api-bionic-stein
+    name: test-s3api-hirsute-wallaby
     parent: func-target
     dependencies: *smoke-jobs
     vars:
-      tox_extra_args: test-s3api:bionic-stein
-- job:
-    name: test-s3api-bionic-rocky
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: test-s3api:bionic-rocky
-- job:
-    name: test-s3api-bionic-queens
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: test-s3api:bionic-queens
-- job:
-    name: bionic-train-gr_swift-proxy
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: swift_gr_region1:bionic-train-gr-r1 swift_gr_region2:bionic-train-gr-r2
+      tox_extra_args: test-s3api:hirsute-wallaby

tests/bundles/focal-wallaby.yaml

@@ -0,0 +1,105 @@
+variables:
+  openstack-origin: &openstack-origin cloud:focal-wallaby
+
+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':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-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
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  swift-proxy:
+    charm: swift-proxy
+    num_units: 1
+    options:
+      zone-assignment: manual
+      replicas: 1
+      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  swift-storage:
+    charm: cs:~openstack-charmers-next/swift-storage
+    num_units: 1
+    storage:
+      block-devices: 'cinder,10G'
+    options:
+      zone: 1
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+relations:
+
+  - - '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'
+
+  - - 'swift-proxy:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'swift-storage:swift-storage'
+    - 'swift-proxy:swift-storage'
+
+  - - 'glance:object-store'
+    - 'swift-proxy:object-store'

tests/bundles/hirsute-wallaby.yaml

@@ -0,0 +1,105 @@
+variables:
+  openstack-origin: &openstack-origin distro
+
+series: hirsute
+
+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':
+
+applications:
+
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  glance-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  cinder-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
+
+  mysql-innodb-cluster:
+    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+
+  keystone:
+    expose: True
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+
+  swift-proxy:
+    charm: swift-proxy
+    num_units: 1
+    options:
+      zone-assignment: manual
+      replicas: 1
+      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
+      openstack-origin: *openstack-origin
+    to:
+      - '4'
+
+  glance:
+    expose: True
+    charm: cs:~openstack-charmers-next/glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+
+  swift-storage:
+    charm: cs:~openstack-charmers-next/swift-storage
+    num_units: 1
+    storage:
+      block-devices: 'cinder,10G'
+    options:
+      zone: 1
+      openstack-origin: *openstack-origin
+    to:
+      - '6'
+
+relations:
+
+  - - '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'
+
+  - - 'swift-proxy:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'swift-storage:swift-storage'
+    - 'swift-proxy:swift-storage'
+
+  - - 'glance:object-store'
+    - 'swift-proxy:object-store'

tests/tests.yaml

@@ -1,6 +1,8 @@
 charm_name: swift-proxy
+
 gate_bundles:
   - test-s3api: groovy-victoria
+  - test-s3api: focal-wallaby
   - test-s3api: focal-victoria
   - test-s3api: focal-ussuri
   - test-s3api: bionic-ussuri
@@ -12,16 +14,22 @@ gate_bundles:
   - bionic-train-gr:
     - swift_gr_region1: bionic-train-gr-r1
     - swift_gr_region2: bionic-train-gr-r2
+
 dev_bundles:
+  - test-s3api: hirsute-wallaby
   - trusty-mitaka
   - test-s3api: xenial-queens
   - xenial-ocata
   - xenial-pike
+
 smoke_bundles:
-  - bionic-train
+  # Use no s3api test for smoke
+  - focal-ussuri
+
 configure:
   - swift_gr_region1:
     - zaza.openstack.charm_tests.swift.setup.wait_for_region2
+
 tests:
   - zaza.openstack.charm_tests.swift.tests.SwiftImageCreateTest
   - zaza.openstack.charm_tests.swift.tests.SwiftProxyTests
@@ -31,8 +39,9 @@ tests:
     - zaza.openstack.charm_tests.swift.tests.S3APITest
   - swift_gr_region1:
     - zaza.openstack.charm_tests.swift.tests.SwiftGlobalReplicationTests
+
 tests_options:
   force_deploy:
-    - groovy-victoria
+    - hirsute-wallaby
   policyd:
     - service: swift