Migrate charm to charmhub latest/edge track

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

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

@@ -10,10 +10,7 @@ tags:
 - amqp
 - misc
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 provides:
   amqp:

osci.yaml

@@ -1,50 +1,7 @@
 - project:
     templates:
-      - charm-yoga-unit-jobs
+      - charm-unit-jobs-py38
-    check:
+      - charm-unit-jobs-py39
-      jobs:
+      - charm-xena-functional-jobs
-      - rabbit-bionic
+      - charm-yoga-functional-jobs
-      - rabbit-focal
-      - rabbit-hirsute
-      - rabbit-impish:
-          voting: false
-      - rabbit-jammy:
-          voting: false
-    vars:
-      needs_charm_build: false
 
-- job:
-    name: rabbit-bionic
-    parent: func-target
-    dependencies: &smoke-jobs
-      - rabbit-focal
-    vars:
-      tox_extra_args: bionic-queens
-- job:
-    name: rabbit-focal
-    parent: func-target
-    dependencies: &lint-jobs
-        - osci-lint
-        - tox-py36
-        - tox-py38
-        - tox-py39
-    vars:
-      tox_extra_args: focal-ussuri
-- job:
-    name: rabbit-hirsute
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: hirsute-wallaby
-- job:
-    name: rabbit-impish
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: impish-xena
-- job:
-    name: rabbit-jammy
-    parent: func-target
-    dependencies: *smoke-jobs
-    vars:
-      tox_extra_args: jammy-yoga

tests/bundles/bionic-queens.yaml

@@ -1,46 +0,0 @@
-series: bionic
-
-relations:
-  - - cinder:amqp
-    - rabbitmq-server:amqp
-  - - cinder:shared-db
-    - percona-cluster:shared-db
-  - - cinder:identity-service
-    - keystone:identity-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - nrpe:nrpe-external-master
-    - rabbitmq-server:nrpe-external-master
-  - - nrpe:monitors
-    - nagios:monitors
-
-applications:
-  rabbitmq-server:
-    charm: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      max-connections: 1000
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      admin-password: openstack
-  nagios:
-    charm: cs:nagios
-    num_units: 1
-  nrpe:
-    charm: cs:nrpe

tests/bundles/bionic-rocky.yaml

@@ -1,53 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:bionic-rocky
-
-series: bionic
-
-relations:
-  - - cinder:amqp
-    - rabbitmq-server:amqp
-  - - cinder:shared-db
-    - percona-cluster:shared-db
-  - - cinder:identity-service
-    - keystone:identity-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - nrpe:nrpe-external-master
-    - rabbitmq-server:nrpe-external-master
-  - - nrpe:monitors
-    - nagios:monitors
-
-applications:
-  rabbitmq-server:
-    charm: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-      max-connections: 1000
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-  nagios:
-    charm: cs:nagios
-    num_units: 1
-  nrpe:
-    charm: cs:nrpe

tests/bundles/bionic-stein.yaml

@@ -1,53 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:bionic-stein
-
-series: bionic
-
-relations:
-  - - cinder:amqp
-    - rabbitmq-server:amqp
-  - - cinder:shared-db
-    - percona-cluster:shared-db
-  - - cinder:identity-service
-    - keystone:identity-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - nrpe:nrpe-external-master
-    - rabbitmq-server:nrpe-external-master
-  - - nrpe:monitors
-    - nagios:monitors
-
-applications:
-  rabbitmq-server:
-    charm: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-      max-connections: 1000
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-  nagios:
-    charm: cs:nagios
-    num_units: 1
-  nrpe:
-    charm: cs:nrpe

tests/bundles/bionic-train.yaml

@@ -1,53 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:bionic-train
-
-series: bionic
-
-relations:
-  - - cinder:amqp
-    - rabbitmq-server:amqp
-  - - cinder:shared-db
-    - percona-cluster:shared-db
-  - - cinder:identity-service
-    - keystone:identity-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - nrpe:nrpe-external-master
-    - rabbitmq-server:nrpe-external-master
-  - - nrpe:monitors
-    - nagios:monitors
-
-applications:
-  rabbitmq-server:
-    charm: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-      max-connections: 1000
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-  nagios:
-    charm: cs:nagios
-    num_units: 1
-  nrpe:
-    charm: cs:nrpe

tests/bundles/bionic-ussuri.yaml

@@ -1,53 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:bionic-ussuri
-
-series: bionic
-
-relations:
-  - - cinder:amqp
-    - rabbitmq-server:amqp
-  - - cinder:shared-db
-    - percona-cluster:shared-db
-  - - cinder:identity-service
-    - keystone:identity-service
-  - - keystone:shared-db
-    - percona-cluster:shared-db
-  - - nrpe:nrpe-external-master
-    - rabbitmq-server:nrpe-external-master
-  - - nrpe:monitors
-    - nagios:monitors
-
-applications:
-  rabbitmq-server:
-    charm: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    options:
-      source: *openstack-origin
-      max-connections: 1000
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-  nagios:
-    charm: cs:nagios
-    num_units: 1
-  nrpe:
-    charm: cs:nrpe

tests/bundles/focal-ussuri.yaml

@@ -1,102 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-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':
-  '7':
-  '8':
-    series: bionic  # nagios not supported on focal yet
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-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: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '7'
-
-  nagios:
-    charm: cs:nagios
-    series: bionic  # not supported on focal yet
-    num_units: 1
-    to:
-      - '8'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'nrpe:nrpe-external-master'
-    - 'rabbitmq-server:nrpe-external-master'
-  - - 'nrpe:monitors'
-    - 'nagios:monitors'

tests/bundles/focal-victoria.yaml

@@ -1,102 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-victoria
-
-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':
-  '7':
-  '8':
-    series: bionic  # nagios not supported on focal yet
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-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: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '7'
-
-  nagios:
-    charm: cs:nagios
-    series: bionic  # not supported on focal yet
-    num_units: 1
-    to:
-      - '8'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'nrpe:nrpe-external-master'
-    - 'rabbitmq-server:nrpe-external-master'
-  - - 'nrpe:monitors'
-    - 'nagios:monitors'

tests/bundles/focal-wallaby.yaml

@@ -1,102 +0,0 @@
-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':
-  '7':
-  '8':
-    series: bionic  # nagios not supported on focal yet
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-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: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '7'
-
-  nagios:
-    charm: cs:nagios
-    series: bionic  # not supported on focal yet
-    num_units: 1
-    to:
-      - '8'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'nrpe:nrpe-external-master'
-    - 'rabbitmq-server:nrpe-external-master'
-  - - 'nrpe:monitors'
-    - 'nagios:monitors'

tests/bundles/focal-xena.yaml

@@ -24,12 +24,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-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: *openstack-origin
@@ -37,6 +39,7 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   rabbitmq-server:
     charm: "../../../rabbitmq-server"
@@ -56,21 +59,23 @@ applications:
       - '5'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '6'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
     to:
       - '7'
+    channel: latest/edge
 
   nagios:
     charm: cs:nagios

tests/bundles/focal-yoga.yaml

@@ -24,12 +24,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-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: *openstack-origin
@@ -37,6 +39,7 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   rabbitmq-server:
     charm: "../../../rabbitmq-server"
@@ -56,21 +59,23 @@ applications:
       - '5'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '6'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
     to:
       - '7'
+    channel: latest/edge
 
   nagios:
     charm: cs:nagios

tests/bundles/groovy-victoria.yaml

@@ -1,102 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: groovy
-
-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':
-  '7':
-  '8':
-    series: bionic  # nagios not supported on focal+ yet
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-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: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '7'
-
-  nagios:
-    charm: cs:nagios
-    series: bionic  # not supported on focal+ yet
-    num_units: 1
-    to:
-      - '8'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'nrpe:nrpe-external-master'
-    - 'rabbitmq-server:nrpe-external-master'
-  - - 'nrpe:monitors'
-    - 'nagios:monitors'

tests/bundles/hirsute-wallaby.yaml

@@ -1,102 +0,0 @@
-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':
-  '7':
-  '8':
-    series: bionic  # nagios not supported on focal+ yet
-
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  cinder-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: "../../../rabbitmq-server"
-    num_units: 3
-    constraints:
-      cpu-cores=2
-    options:
-      min-cluster-size: 3
-      max-cluster-tries: 6
-      ssl: "off"
-      management_plugin: "False"
-      stats_cron_schedule: "*/1 * * * *"
-      source: *openstack-origin
-    to:
-      - '3'
-      - '4'
-      - '5'
-
-  cinder:
-    charm: cs:~openstack-charmers-next/cinder
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      admin-password: openstack
-    to:
-      - '7'
-
-  nagios:
-    charm: cs:nagios
-    series: bionic  # not supported on focal+ yet
-    num_units: 1
-    to:
-      - '8'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-
-  - - 'cinder:amqp'
-    - 'rabbitmq-server:amqp'
-  - - 'cinder:shared-db'
-    - 'cinder-mysql-router:shared-db'
-  - - 'cinder-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'cinder:identity-service'
-    - 'keystone:identity-service'
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'nrpe:nrpe-external-master'
-    - 'rabbitmq-server:nrpe-external-master'
-  - - 'nrpe:monitors'
-    - 'nagios:monitors'

tests/bundles/impish-xena.yaml

@@ -24,12 +24,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-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: *openstack-origin
@@ -37,6 +39,7 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   rabbitmq-server:
     charm: "../../../rabbitmq-server"
@@ -56,21 +59,23 @@ applications:
       - '5'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '6'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
     to:
       - '7'
+    channel: latest/edge
 
   nagios:
     charm: cs:nagios

tests/bundles/jammy-yoga.yaml

@@ -24,12 +24,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   cinder-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: *openstack-origin
@@ -37,6 +39,7 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   rabbitmq-server:
     charm: "../../../rabbitmq-server"
@@ -56,21 +59,23 @@ applications:
       - '5'
 
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: ch:cinder
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '6'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
       admin-password: openstack
     to:
       - '7'
+    channel: latest/edge
 
   nagios:
     charm: cs:nagios

tests/tests.yaml

@@ -1,22 +1,14 @@
 charm_name: rabbitmq-server
 
 smoke_bundles:
-  - focal-ussuri
+  - focal-xena
 
 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
 
@@ -27,6 +19,5 @@ tests:
 tests_options:
   force_deploy:
     # nrpe charm doesn't support hirsute->jammy and needs to be force installed
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga