Migrate charm to charmhub latest/edge track

Change-Id: I3437bb58b85ccedf047910c0bf783f56dd438bf6

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,13 +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
-      - charm-queens-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: keystone-ldap

src/metadata.yaml

@@ -11,10 +11,7 @@ tags:
 - ldap
 - identity
 series:
-- bionic
 - focal
-- groovy
-- hirsute
 - impish
 provides:
   domain-backend:

src/tests/bundles/bionic-queens.yaml

@@ -1,32 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-applications:
-  percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
-    num_units: 1
-    to:
-    - '0'
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    to:
-    - '1'
-  ldap-server:
-    charm: cs:~openstack-charmers/ldap-test-fixture
-    num_units: 1
-    to:
-    - '2'
-  keystone-ldap:
-    charm: ../../../keystone-ldap
-
-relations:
-- - 'keystone:domain-backend'
-  - 'keystone-ldap:domain-backend'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'

src/tests/bundles/bionic-rocky.yaml

@@ -1,34 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-applications:
-  percona-cluster:
-    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'
-  ldap-server:
-    charm: cs:~openstack-charmers/ldap-test-fixture
-    num_units: 1
-    to:
-    - '2'
-  keystone-ldap:
-    charm: ../../../keystone-ldap
-
-relations:
-- - 'keystone:domain-backend'
-  - 'keystone-ldap:domain-backend'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'

src/tests/bundles/bionic-stein.yaml

@@ -1,34 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-applications:
-  percona-cluster:
-    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'
-  ldap-server:
-    charm: cs:~openstack-charmers/ldap-test-fixture
-    num_units: 1
-    to:
-    - '2'
-  keystone-ldap:
-    charm: ../../../keystone-ldap
-
-relations:
-- - 'keystone:domain-backend'
-  - 'keystone-ldap:domain-backend'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'

src/tests/bundles/bionic-train.yaml

@@ -1,34 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-applications:
-  percona-cluster:
-    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'
-  ldap-server:
-    charm: cs:~openstack-charmers/ldap-test-fixture
-    num_units: 1
-    to:
-    - '2'
-  keystone-ldap:
-    charm: ../../../keystone-ldap
-
-relations:
-- - 'keystone:domain-backend'
-  - 'keystone-ldap:domain-backend'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'

src/tests/bundles/bionic-ussuri.yaml

@@ -1,34 +0,0 @@
-series: bionic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-  '2':
-
-applications:
-  percona-cluster:
-    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'
-  ldap-server:
-    charm: cs:~openstack-charmers/ldap-test-fixture
-    num_units: 1
-    to:
-    - '2'
-  keystone-ldap:
-    charm: ../../../keystone-ldap
-
-relations:
-- - 'keystone:domain-backend'
-  - 'keystone-ldap:domain-backend'
-- - 'keystone:shared-db'
-  - 'percona-cluster:shared-db'

src/tests/bundles/focal-ussuri.yaml

@@ -1,62 +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':
-    series: bionic
-
-applications:
-
-  keystone-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
-      # Reduce chances of spurious "super-read-only" failures, see lp:1882205
-      expel-timeout: 20
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '3'
-
-  ldap-server:
-    charm: cs:~openstack-charmers/ldap-test-fixture
-    series: bionic
-    num_units: 1
-    to:
-    - '4'
-
-  keystone-ldap:
-    charm: ../../../keystone-ldap
-
-relations:
-  - - 'keystone:domain-backend'
-    - 'keystone-ldap:domain-backend'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

src/tests/bundles/focal-victoria.yaml

@@ -1,62 +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':
-    series: bionic
-
-applications:
-
-  keystone-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
-      # Reduce chances of spurious "super-read-only" failures, see lp:1882205
-      expel-timeout: 20
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '3'
-
-  ldap-server:
-    charm: cs:~openstack-charmers/ldap-test-fixture
-    num_units: 1
-    series: bionic
-    to:
-    - '4'
-
-  keystone-ldap:
-    charm: ../../../keystone-ldap
-
-relations:
-  - - 'keystone:domain-backend'
-    - 'keystone-ldap:domain-backend'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

src/tests/bundles/focal-wallaby.yaml

@@ -1,62 +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':
-    series: bionic
-
-applications:
-
-  keystone-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
-      # Reduce chances of spurious "super-read-only" failures, see lp:1882205
-      expel-timeout: 20
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '3'
-
-  ldap-server:
-    charm: cs:~openstack-charmers/ldap-test-fixture
-    num_units: 1
-    series: bionic
-    to:
-    - '4'
-
-  keystone-ldap:
-    charm: ../../../keystone-ldap
-
-relations:
-  - - 'keystone:domain-backend'
-    - 'keystone-ldap:domain-backend'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

src/tests/bundles/focal-xena.yaml

@@ -20,10 +20,11 @@ machines:
 applications:
 
   keystone-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
@@ -33,14 +34,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
 
   ldap-server:
     charm: cs:~openstack-charmers/ldap-test-fixture

src/tests/bundles/focal-yoga.yaml

@@ -20,10 +20,11 @@ machines:
 applications:
 
   keystone-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
@@ -33,14 +34,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
 
   ldap-server:
     charm: cs:~openstack-charmers/ldap-test-fixture

src/tests/bundles/hirsute-wallaby.yaml

@@ -1,62 +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':
-    series: bionic
-
-applications:
-
-  keystone-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
-      # Reduce chances of spurious "super-read-only" failures, see lp:1882205
-      expel-timeout: 20
-    to:
-      - '0'
-      - '1'
-      - '2'
-
-  keystone:
-    charm: cs:~openstack-charmers-next/keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '3'
-
-  ldap-server:
-    charm: cs:~openstack-charmers/ldap-test-fixture
-    num_units: 1
-    series: bionic
-    to:
-    - '4'
-
-  keystone-ldap:
-    charm: ../../../keystone-ldap
-
-relations:
-  - - 'keystone:domain-backend'
-    - 'keystone-ldap:domain-backend'
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

src/tests/bundles/impish-xena.yaml

@@ -20,10 +20,11 @@ machines:
 applications:
 
   keystone-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
@@ -33,14 +34,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
 
   ldap-server:
     charm: cs:~openstack-charmers/ldap-test-fixture

src/tests/bundles/jammy-yoga.yaml

@@ -20,10 +20,11 @@ machines:
 applications:
 
   keystone-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
@@ -33,14 +34,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
 
   ldap-server:
     charm: cs:~openstack-charmers/ldap-test-fixture

src/tests/tests.yaml

@@ -1,22 +1,13 @@
 charm_name: keystone-ldap
 
 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
 
@@ -31,6 +22,5 @@ tests:
 
 tests_options:
   force_deploy:
-    - hirsute-wallaby
     - impish-xena
     - jammy-yoga