Migrate charm to charmhub latest/edge track

Change-Id: I5653b9631b340fed318aaafcb8cee55ea3602e60

charmcraft.yaml

@@ -0,0 +1,27 @@
+type: charm
+
+parts:
+  charm:
+    plugin: dump
+    source: .
+    prime:
+      - actions/*
+      - files/*
+      - hooks/*
+      - lib/*
+      - templates/*
+      - actions.yaml
+      - config.yaml
+      - copyright
+      - hardening.yaml
+      - icon.svg
+      - LICENSE
+      - Makefile
+      - metadata.yaml
+      - README.md
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64

metadata.yaml

@@ -8,10 +8,7 @@ tags:
 - misc
 - openstack
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 subordinate: false
 provides:

osci.yaml

@@ -1,10 +1,6 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
-      - charm-yoga-functional-jobs
+      - charm-unit-jobs-py39
       - charm-xena-functional-jobs
-      - charm-wallaby-functional-jobs
+      - charm-yoga-functional-jobs
-      - charm-victoria-functional-jobs
-      - charm-ussuri-functional-jobs
-      - charm-stein-functional-jobs
-      - charm-queens-functional-jobs

tests/bundles/bionic-queens.yaml

@@ -1,84 +0,0 @@
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-    constraints: "mem=2048"
-  '7':
-    constraints: "mem=2048"
-  '8':
-    constraints: "mem=2048"
-  '9':
-  '10':
-  '11':
-
-relations:
-  - ['vault:shared-db', 'mysql:shared-db']
-  - ['keystone:shared-db', 'mysql:shared-db']
-  - ['glance:shared-db', 'mysql:shared-db']
-  - ['glance:ceph', 'ceph-mon:client']
-  - ['keystone:certificates', 'vault:certificates']
-  - ['glance:certificates', 'vault:certificates']
-  - ['glance-simplestreams-sync:certificates', 'vault:certificates']
-  - ['glance:identity-service', 'keystone:identity-service']
-  - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
-  - ['ceph-osd:mon', 'ceph-mon:osd']
-  - ['ceph-radosgw:mon', 'ceph-mon:radosgw']
-  - ['ceph-radosgw:identity-service', 'keystone:identity-service']
-  - ['ceph-radosgw:certificates', 'vault:certificates']
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-    to:
-      - '1'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    to:
-      - '3'
-  glance-simplestreams-sync:
-    charm: ../../glance-simplestreams-sync
-    num_units: 1
-    to:
-      - '4'
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    to:
-      - '5'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    to:
-      - '6'
-      - '7'
-      - '8'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    to:
-      - '9'
-      - '10'
-      - '11'

tests/bundles/bionic-rocky.yaml

@@ -1,98 +0,0 @@
-options:
-  source: &source cloud:bionic-rocky
-
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-    constraints: "mem=2048"
-  '7':
-    constraints: "mem=2048"
-  '8':
-    constraints: "mem=2048"
-  '9':
-  '10':
-  '11':
-
-relations:
-  - ['vault:shared-db', 'mysql:shared-db']
-  - ['keystone:shared-db', 'mysql:shared-db']
-  - ['glance:shared-db', 'mysql:shared-db']
-  - ['glance:ceph', 'ceph-mon:client']
-  - ['keystone:certificates', 'vault:certificates']
-  - ['glance:certificates', 'vault:certificates']
-  - ['glance-simplestreams-sync:certificates', 'vault:certificates']
-  - ['glance:identity-service', 'keystone:identity-service']
-  - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
-  - ['ceph-osd:mon', 'ceph-mon:osd']
-  - ['ceph-radosgw:mon', 'ceph-mon:radosgw']
-  - ['ceph-radosgw:identity-service', 'keystone:identity-service']
-  - ['ceph-radosgw:certificates', 'vault:certificates']
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-    to:
-      - '1'
-  keystone:
-    series: bionic
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '3'
-  glance-simplestreams-sync:
-    charm: ../../glance-simplestreams-sync
-    num_units: 1
-    to:
-      - '4'
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *source
-    to:
-      - '5'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *source
-    to:
-      - '6'
-      - '7'
-      - '8'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-    to:
-      - '9'
-      - '10'
-      - '11'

tests/bundles/bionic-stein.yaml

@@ -1,98 +0,0 @@
-options:
-  source: &source cloud:bionic-stein
-
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-    constraints: "mem=2048"
-  '7':
-    constraints: "mem=2048"
-  '8':
-    constraints: "mem=2048"
-  '9':
-  '10':
-  '11':
-
-relations:
-  - ['vault:shared-db', 'mysql:shared-db']
-  - ['keystone:shared-db', 'mysql:shared-db']
-  - ['glance:shared-db', 'mysql:shared-db']
-  - ['glance:ceph', 'ceph-mon:client']
-  - ['keystone:certificates', 'vault:certificates']
-  - ['glance:certificates', 'vault:certificates']
-  - ['glance-simplestreams-sync:certificates', 'vault:certificates']
-  - ['glance:identity-service', 'keystone:identity-service']
-  - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
-  - ['ceph-osd:mon', 'ceph-mon:osd']
-  - ['ceph-radosgw:mon', 'ceph-mon:radosgw']
-  - ['ceph-radosgw:identity-service', 'keystone:identity-service']
-  - ['ceph-radosgw:certificates', 'vault:certificates']
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-    to:
-      - '1'
-  keystone:
-    series: bionic
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '3'
-  glance-simplestreams-sync:
-    charm: ../../glance-simplestreams-sync
-    num_units: 1
-    to:
-      - '4'
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *source
-    to:
-      - '5'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *source
-    to:
-      - '6'
-      - '7'
-      - '8'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-    to:
-      - '9'
-      - '10'
-      - '11'

tests/bundles/bionic-train.yaml

@@ -1,98 +0,0 @@
-options:
-  source: &source cloud:bionic-train
-
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-    constraints: "mem=2048"
-  '7':
-    constraints: "mem=2048"
-  '8':
-    constraints: "mem=2048"
-  '9':
-  '10':
-  '11':
-
-relations:
-  - ['vault:shared-db', 'mysql:shared-db']
-  - ['keystone:shared-db', 'mysql:shared-db']
-  - ['glance:shared-db', 'mysql:shared-db']
-  - ['glance:ceph', 'ceph-mon:client']
-  - ['keystone:certificates', 'vault:certificates']
-  - ['glance:certificates', 'vault:certificates']
-  - ['glance-simplestreams-sync:certificates', 'vault:certificates']
-  - ['glance:identity-service', 'keystone:identity-service']
-  - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
-  - ['ceph-osd:mon', 'ceph-mon:osd']
-  - ['ceph-radosgw:mon', 'ceph-mon:radosgw']
-  - ['ceph-radosgw:identity-service', 'keystone:identity-service']
-  - ['ceph-radosgw:certificates', 'vault:certificates']
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-    to:
-      - '1'
-  keystone:
-    series: bionic
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '3'
-  glance-simplestreams-sync:
-    charm: ../../glance-simplestreams-sync
-    num_units: 1
-    to:
-      - '4'
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *source
-    to:
-      - '5'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *source
-    to:
-      - '6'
-      - '7'
-      - '8'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-    to:
-      - '9'
-      - '10'
-      - '11'

tests/bundles/bionic-ussuri.yaml

@@ -1,98 +0,0 @@
-options:
-  source: &source cloud:bionic-ussuri
-
-series: bionic
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-    constraints: "mem=2048"
-  '7':
-    constraints: "mem=2048"
-  '8':
-    constraints: "mem=2048"
-  '9':
-  '10':
-  '11':
-
-relations:
-  - ['vault:shared-db', 'mysql:shared-db']
-  - ['keystone:shared-db', 'mysql:shared-db']
-  - ['glance:shared-db', 'mysql:shared-db']
-  - ['glance:ceph', 'ceph-mon:client']
-  - ['keystone:certificates', 'vault:certificates']
-  - ['glance:certificates', 'vault:certificates']
-  - ['glance-simplestreams-sync:certificates', 'vault:certificates']
-  - ['glance:identity-service', 'keystone:identity-service']
-  - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
-  - ['ceph-osd:mon', 'ceph-mon:osd']
-  - ['ceph-radosgw:mon', 'ceph-mon:radosgw']
-  - ['ceph-radosgw:identity-service', 'keystone:identity-service']
-  - ['ceph-radosgw:certificates', 'vault:certificates']
-
-applications:
-  mysql:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-      - '0'
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-    to:
-      - '1'
-  keystone:
-    series: bionic
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '2'
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '3'
-  glance-simplestreams-sync:
-    charm: ../../glance-simplestreams-sync
-    num_units: 1
-    to:
-      - '4'
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *source
-    to:
-      - '5'
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *source
-    to:
-      - '6'
-      - '7'
-      - '8'
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-    to:
-      - '9'
-      - '10'
-      - '11'

tests/bundles/focal-ussuri.yaml

@@ -1,122 +0,0 @@
-variables:
-  source: &source distro
-
-series: focal
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-    constraints: "mem=2048"
-  '9':
-    constraints: "mem=2048"
-  '10':
-    constraints: "mem=2048"
-  '11':
-  '12':
-  '13':
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-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: *source
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-    to:
-      - '3'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '5'
-
-  glance-simplestreams-sync:
-    charm: ../../glance-simplestreams-sync
-    num_units: 1
-    to:
-      - '6'
-
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *source
-    to:
-      - '7'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *source
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-    to:
-      - '11'
-      - '12'
-      - '13'
-
-relations:
-  - ['keystone:certificates', 'vault:certificates']
-  - ['glance:certificates', 'vault:certificates']
-  - ['glance-simplestreams-sync:certificates', 'vault:certificates']
-  - ['glance:identity-service', 'keystone:identity-service']
-  - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
-  - ['keystone:shared-db','keystone-mysql-router:shared-db']
-  - ['glance:shared-db','glance-mysql-router:shared-db']
-  - ['glance:ceph', 'ceph-mon:client']
-  - ['vault:shared-db','vault-mysql-router:shared-db']
-  - ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['ceph-osd:mon', 'ceph-mon:osd']
-  - ['ceph-radosgw:mon', 'ceph-mon:radosgw']
-  - ['ceph-radosgw:identity-service', 'keystone:identity-service']
-  - ['ceph-radosgw:certificates', 'vault:certificates']

tests/bundles/focal-victoria.yaml

@@ -1,122 +0,0 @@
-variables:
-  source: &source cloud:focal-victoria
-
-series: focal
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-    constraints: "mem=2048"
-  '9':
-    constraints: "mem=2048"
-  '10':
-    constraints: "mem=2048"
-  '11':
-  '12':
-  '13':
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-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: *source
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-    to:
-      - '3'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '5'
-
-  glance-simplestreams-sync:
-    charm: ../../glance-simplestreams-sync
-    num_units: 1
-    to:
-      - '6'
-
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *source
-    to:
-      - '7'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *source
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-    to:
-      - '11'
-      - '12'
-      - '13'
-
-relations:
-  - ['keystone:certificates', 'vault:certificates']
-  - ['glance:certificates', 'vault:certificates']
-  - ['glance-simplestreams-sync:certificates', 'vault:certificates']
-  - ['glance:identity-service', 'keystone:identity-service']
-  - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
-  - ['keystone:shared-db','keystone-mysql-router:shared-db']
-  - ['glance:shared-db','glance-mysql-router:shared-db']
-  - ['glance:ceph', 'ceph-mon:client']
-  - ['vault:shared-db','vault-mysql-router:shared-db']
-  - ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['ceph-osd:mon', 'ceph-mon:osd']
-  - ['ceph-radosgw:mon', 'ceph-mon:radosgw']
-  - ['ceph-radosgw:identity-service', 'keystone:identity-service']
-  - ['ceph-radosgw:certificates', 'vault:certificates']

tests/bundles/focal-wallaby.yaml

@@ -1,122 +0,0 @@
-variables:
-  source: &source cloud:focal-wallaby
-
-series: focal
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-    constraints: "mem=2048"
-  '9':
-    constraints: "mem=2048"
-  '10':
-    constraints: "mem=2048"
-  '11':
-  '12':
-  '13':
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-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: *source
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-    to:
-      - '3'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '5'
-
-  glance-simplestreams-sync:
-    charm: ../../glance-simplestreams-sync
-    num_units: 1
-    to:
-      - '6'
-
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *source
-    to:
-      - '7'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *source
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-    to:
-      - '11'
-      - '12'
-      - '13'
-
-relations:
-  - ['keystone:certificates', 'vault:certificates']
-  - ['glance:certificates', 'vault:certificates']
-  - ['glance-simplestreams-sync:certificates', 'vault:certificates']
-  - ['glance:identity-service', 'keystone:identity-service']
-  - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
-  - ['keystone:shared-db','keystone-mysql-router:shared-db']
-  - ['glance:shared-db','glance-mysql-router:shared-db']
-  - ['glance:ceph', 'ceph-mon:client']
-  - ['vault:shared-db','vault-mysql-router:shared-db']
-  - ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['ceph-osd:mon', 'ceph-mon:osd']
-  - ['ceph-radosgw:mon', 'ceph-mon:radosgw']
-  - ['ceph-radosgw:identity-service', 'keystone:identity-service']
-  - ['ceph-radosgw:certificates', 'vault:certificates']

tests/bundles/focal-xena.yaml

@@ -29,14 +29,17 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *source
@@ -44,28 +47,32 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     num_units: 1
     to:
       - '3'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *source
     to:
       - '4'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *source
     to:
       - '5'
+    channel: latest/edge
 
   glance-simplestreams-sync:
     charm: ../../glance-simplestreams-sync
@@ -74,15 +81,16 @@ applications:
       - '6'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     options:
       source: *source
     to:
       - '7'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -92,9 +100,10 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *source
@@ -102,6 +111,7 @@ applications:
       - '11'
       - '12'
       - '13'
+    channel: latest/edge
 
 relations:
   - ['keystone:certificates', 'vault:certificates']

tests/bundles/focal-yoga.yaml

@@ -29,14 +29,17 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *source
@@ -44,28 +47,32 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     num_units: 1
     to:
       - '3'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *source
     to:
       - '4'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *source
     to:
       - '5'
+    channel: latest/edge
 
   glance-simplestreams-sync:
     charm: ../../glance-simplestreams-sync
@@ -74,15 +81,16 @@ applications:
       - '6'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     options:
       source: *source
     to:
       - '7'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -92,9 +100,10 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *source
@@ -102,6 +111,7 @@ applications:
       - '11'
       - '12'
       - '13'
+    channel: latest/edge
 
 relations:
   - ['keystone:certificates', 'vault:certificates']

tests/bundles/hirsute-wallaby.yaml

@@ -1,122 +0,0 @@
-variables:
-  source: &source distro
-
-series: hirsute
-
-comment:
-  - 'machines section to decide order of deployment. database sooner = faster'
-
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-    constraints: "mem=2048"
-  '9':
-    constraints: "mem=2048"
-  '10':
-    constraints: "mem=2048"
-  '11':
-  '12':
-  '13':
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  vault-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: *source
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  vault:
-    charm: cs:~openstack-charmers-next/vault
-    num_units: 1
-    to:
-      - '3'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '4'
-
-  glance:
-    charm: cs:~openstack-charmers-next/glance
-    num_units: 1
-    options:
-      openstack-origin: *source
-    to:
-      - '5'
-
-  glance-simplestreams-sync:
-    charm: ../../glance-simplestreams-sync
-    num_units: 1
-    to:
-      - '6'
-
-  ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
-    num_units: 1
-    options:
-      source: *source
-    to:
-      - '7'
-
-  ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *source
-    to:
-      - '8'
-      - '9'
-      - '10'
-
-  ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
-    num_units: 3
-    options:
-      source: *source
-    to:
-      - '11'
-      - '12'
-      - '13'
-
-relations:
-  - ['keystone:certificates', 'vault:certificates']
-  - ['glance:certificates', 'vault:certificates']
-  - ['glance-simplestreams-sync:certificates', 'vault:certificates']
-  - ['glance:identity-service', 'keystone:identity-service']
-  - ['glance-simplestreams-sync:identity-service', 'keystone:identity-service']
-  - ['keystone:shared-db','keystone-mysql-router:shared-db']
-  - ['glance:shared-db','glance-mysql-router:shared-db']
-  - ['glance:ceph', 'ceph-mon:client']
-  - ['vault:shared-db','vault-mysql-router:shared-db']
-  - ['keystone-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['glance-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['vault-mysql-router:db-router','mysql-innodb-cluster:db-router']
-  - ['ceph-osd:mon', 'ceph-mon:osd']
-  - ['ceph-radosgw:mon', 'ceph-mon:radosgw']
-  - ['ceph-radosgw:identity-service', 'keystone:identity-service']
-  - ['ceph-radosgw:certificates', 'vault:certificates']

tests/bundles/impish-xena.yaml

@@ -29,14 +29,17 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *source
@@ -44,28 +47,32 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     num_units: 1
     to:
       - '3'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *source
     to:
       - '4'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *source
     to:
       - '5'
+    channel: latest/edge
 
   glance-simplestreams-sync:
     charm: ../../glance-simplestreams-sync
@@ -74,15 +81,16 @@ applications:
       - '6'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     options:
       source: *source
     to:
       - '7'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -92,9 +100,10 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *source
@@ -102,6 +111,7 @@ applications:
       - '11'
       - '12'
       - '13'
+    channel: latest/edge
 
 relations:
   - ['keystone:certificates', 'vault:certificates']

tests/bundles/jammy-yoga.yaml

@@ -29,14 +29,17 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   glance-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   vault-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: ch:mysql-innodb-cluster
     num_units: 3
     options:
       source: *source
@@ -44,28 +47,32 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   vault:
-    charm: cs:~openstack-charmers-next/vault
+    charm: ch:vault
     num_units: 1
     to:
       - '3'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *source
     to:
       - '4'
+    channel: latest/edge
 
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: ch:glance
     num_units: 1
     options:
       openstack-origin: *source
     to:
       - '5'
+    channel: latest/edge
 
   glance-simplestreams-sync:
     charm: ../../glance-simplestreams-sync
@@ -74,15 +81,16 @@ applications:
       - '6'
 
   ceph-radosgw:
-    charm: cs:~openstack-charmers-next/ceph-radosgw
+    charm: ch:ceph-radosgw
     num_units: 1
     options:
       source: *source
     to:
       - '7'
+    channel: latest/edge
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: ch:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -92,9 +100,10 @@ applications:
       - '8'
       - '9'
       - '10'
+    channel: latest/edge
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: ch:ceph-mon
     num_units: 3
     options:
       source: *source
@@ -102,6 +111,7 @@ applications:
       - '11'
       - '12'
       - '13'
+    channel: latest/edge
 
 relations:
   - ['keystone:certificates', 'vault:certificates']

tests/tests.yaml

@@ -6,25 +6,15 @@ comment:
 # functest-run-suite ...
 # functest-deploy --bundle /path/to/gate/bundle
 gate_bundles:
-  - bionic-queens
-  - bionic-stein
-  - bionic-ussuri
-  - focal-ussuri
-  - focal-victoria
-  - focal-wallaby
   - focal-xena
-  - hirsute-wallaby
   - impish-xena
 
 dev_bundles:
-  - bionic-rocky
-  - bionic-train
   - focal-yoga
   - jammy-yoga
 
 tests_options:
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga
 
@@ -32,7 +22,7 @@ tests_options:
 # functest-deploy --bundle /path/to/smoke/bundle
 # smoke bundle should (Ubuntu LTS latest)-(OpenStack latest)
 smoke_bundles:
-  - focal-ussuri
+  - focal-xena
 
 # special target deploy status for above deploy phase
 target_deploy_status: