Migration charm to charmhub latest/edge track

Change-Id: I3860f8c83cc4ab37c429d7a44f0b8d292078b657

charmcraft.yaml

@@ -0,0 +1,13 @@
+type: charm
+
+parts:
+  charm:
+    source: src/
+    plugin: reactive
+    build-snaps: [charm]
+
+bases:
+  - name: ubuntu
+    channel: "20.04"
+    architectures:
+      - amd64

metadata.yaml

@@ -0,0 +1 @@
+src/metadata.yaml

osci.yaml

@@ -1,12 +1,9 @@
 - 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
     vars:
       needs_charm_build: true
       charm_build_name: barbican

src/config.yaml

@@ -44,3 +44,5 @@ options:
     type: int
     description: |
       Maximum allowed http request size against the barbican-api.
+  openstack-origin:
+    default: yoga

src/metadata.yaml

@@ -8,10 +8,7 @@ description: |
 tags:
 - openstack
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 subordinate: false
 requires:

src/tests/bundles/bionic-rocky.yaml

@@ -1,50 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-
-applications:
-
-  mysql:
-    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-rocky
-    to:
-      - '1'
-
-  barbican:
-    series: bionic
-    charm: ../../../barbican
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-rocky
-      debug: true
-    to:
-      - '2'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '3'
-
-relations:
-- - mysql:shared-db
-  - keystone:shared-db
-- - mysql:shared-db
-  - barbican:shared-db
-- - keystone:identity-service
-  - barbican:identity-service
-- - rabbitmq-server:amqp
-  - barbican:amqp

src/tests/bundles/bionic-stein.yaml

@@ -1,50 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-
-applications:
-
-  mysql:
-    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-stein
-    to:
-      - '1'
-
-  barbican:
-    series: bionic
-    charm: ../../../barbican
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-stein
-      debug: true
-    to:
-      - '2'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '3'
-
-relations:
-- - mysql:shared-db
-  - keystone:shared-db
-- - mysql:shared-db
-  - barbican:shared-db
-- - keystone:identity-service
-  - barbican:identity-service
-- - rabbitmq-server:amqp
-  - barbican:amqp

src/tests/bundles/bionic-train.yaml

@@ -1,50 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-
-applications:
-
-  mysql:
-    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-train
-    to:
-      - '1'
-
-  barbican:
-    series: bionic
-    charm: ../../../barbican
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-train
-      debug: true
-    to:
-      - '2'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '3'
-
-relations:
-- - mysql:shared-db
-  - keystone:shared-db
-- - mysql:shared-db
-  - barbican:shared-db
-- - keystone:identity-service
-  - barbican:identity-service
-- - rabbitmq-server:amqp
-  - barbican:amqp

src/tests/bundles/bionic-ussuri.yaml

@@ -1,50 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-  '3':
-
-applications:
-
-  mysql:
-    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'
-
-  barbican:
-    series: bionic
-    charm: ../../../barbican
-    num_units: 1
-    options:
-      openstack-origin: cloud:bionic-ussuri
-      debug: true
-    to:
-      - '2'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '3'
-
-relations:
-- - mysql:shared-db
-  - keystone:shared-db
-- - mysql:shared-db
-  - barbican:shared-db
-- - keystone:identity-service
-  - barbican:identity-service
-- - rabbitmq-server:amqp
-  - barbican:amqp

src/tests/bundles/focal-ussuri.yaml

@@ -1,74 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series focal
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  barbican-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:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  barbican:
-    series: *series
-    charm: ../../../barbican
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '4'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '5'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'barbican:shared-db'
-    - 'barbican-mysql-router:shared-db'
-  - - 'barbican-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone:identity-service'
-    - 'barbican:identity-service'
-
-  - - 'rabbitmq-server:amqp'
-    - 'barbican:amqp'

src/tests/bundles/focal-victoria.yaml

@@ -1,74 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-victoria
-
-series: &series focal
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  barbican-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:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  barbican:
-    series: *series
-    charm: ../../../barbican
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '4'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '5'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'barbican:shared-db'
-    - 'barbican-mysql-router:shared-db'
-  - - 'barbican-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone:identity-service'
-    - 'barbican:identity-service'
-
-  - - 'rabbitmq-server:amqp'
-    - 'barbican:amqp'

src/tests/bundles/focal-wallaby.yaml

@@ -1,74 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-wallaby
-
-series: &series focal
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  barbican-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:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  barbican:
-    series: *series
-    charm: ../../../barbican
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '4'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '5'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'barbican:shared-db'
-    - 'barbican-mysql-router:shared-db'
-  - - 'barbican-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone:identity-service'
-    - 'barbican:identity-service'
-
-  - - 'rabbitmq-server:amqp'
-    - 'barbican:amqp'

src/tests/bundles/focal-xena.yaml

@@ -17,12 +17,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   barbican-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
@@ -30,14 +32,16 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   barbican:
     series: *series
@@ -50,10 +54,11 @@ applications:
       - '4'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '5'
+    channel: latest/edge
 
 relations:
 

src/tests/bundles/focal-yoga.yaml

@@ -17,12 +17,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   barbican-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
@@ -30,14 +32,16 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   barbican:
     series: *series
@@ -50,10 +54,11 @@ applications:
       - '4'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '5'
+    channel: latest/edge
 
 relations:
 

src/tests/bundles/hirsute-wallaby.yaml

@@ -1,74 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: &series hirsute
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-
-applications:
-
-  keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
-  barbican-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:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-
-  barbican:
-    series: *series
-    charm: ../../../barbican
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '4'
-
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    to:
-      - '5'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'barbican:shared-db'
-    - 'barbican-mysql-router:shared-db'
-  - - 'barbican-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone:identity-service'
-    - 'barbican:identity-service'
-
-  - - 'rabbitmq-server:amqp'
-    - 'barbican:amqp'

src/tests/bundles/impish-xena.yaml

@@ -17,12 +17,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   barbican-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
@@ -30,14 +32,16 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   barbican:
     series: *series
@@ -50,10 +54,11 @@ applications:
       - '4'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '5'
+    channel: latest/edge
 
 relations:
 

src/tests/bundles/jammy-yoga.yaml

@@ -17,12 +17,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: ch:mysql-router
+    channel: latest/edge
   barbican-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
@@ -30,14 +32,16 @@ applications:
       - '0'
       - '1'
       - '2'
+    channel: latest/edge
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: ch:keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
+    channel: latest/edge
 
   barbican:
     series: *series
@@ -50,10 +54,11 @@ applications:
       - '4'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: ch:rabbitmq-server
     num_units: 1
     to:
       - '5'
+    channel: latest/edge
 
 relations:
 

src/tests/tests.yaml

@@ -1,24 +1,15 @@
 charm_name: barbican
 smoke_bundles:
-- focal-ussuri
-gate_bundles:
-- bionic-stein
-- bionic-ussuri
-- focal-ussuri
-- focal-victoria
-- focal-wallaby
 - focal-xena
-- hirsute-wallaby
+gate_bundles:
+- focal-xena
 - impish-xena
 dev_bundles:
-- bionic-rocky
-- bionic-train
 - focal-yoga
 - jammy-yoga
 tests:
 - zaza.openstack.charm_tests.barbican.tests.BarbicanTest
 tests_options:
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga