Add Antelope support

* sync charm-helpers to classic charms
* change openstack-origin/source default to antelope
* align testing with antelope
* add new antelope bundles
* add antelope bundles to tests.yaml
* add antelope tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases

Change-Id: I2d27ef9d08b01d54741fec5e34e028a6abbe2425

.zuul.yaml

@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-zed-jobs
+      - openstack-python3-charm-jobs
       - openstack-cover-jobs

charmcraft.yaml

@@ -31,6 +31,9 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [amd64]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [amd64]
   - build-on:
       - name: ubuntu
         channel: "22.04"
@@ -42,6 +45,9 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [arm64]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [arm64]
   - build-on:
       - name: ubuntu
         channel: "22.04"
@@ -53,6 +59,9 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [ppc64el]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [ppc64el]
   - build-on:
       - name: ubuntu
         channel: "22.04"
@@ -64,3 +73,6 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [s390x]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [s390x]

osci.yaml

@@ -1,7 +1,7 @@
 - project:
     templates:
       - charm-unit-jobs-py310
-      - charm-zed-functional-jobs
+      - charm-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: barbican

src/config.yaml

@@ -45,7 +45,7 @@ options:
     description: |
       Maximum allowed http request size against the barbican-api.
   openstack-origin:
-    default: zed
+    default: antelope
   use-internal-endpoints:
     default: True
     type: boolean

src/metadata.yaml

@@ -10,6 +10,7 @@ tags:
 series:
 - jammy
 - kinetic
+- lunar
 subordinate: false
 requires:
   shared-db:

src/tests/bundles/jammy-antelope.yaml

@@ -0,0 +1,81 @@
+variables:
+  openstack-origin: &openstack-origin cloud:jammy-antelope
+
+local_overlay_enabled: False
+
+series: &series jammy
+
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+    constraints: mem=3072M
+  '2':
+    constraints: mem=3072M
+  '3':
+  '4':
+  '5':
+
+applications:
+
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  barbican-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+    channel: latest/edge
+
+  barbican:
+    series: *series
+    charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      debug: true
+    to:
+      - '4'
+
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+      - '5'
+    channel: latest/edge
+
+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/jammy-zed.yaml

@@ -47,7 +47,7 @@ applications:
 
   barbican:
     series: *series
-    charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
+    charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
     num_units: 1
     options:
       openstack-origin: *openstack-origin

src/tests/bundles/kinetic-zed.yaml

@@ -47,7 +47,7 @@ applications:
 
   barbican:
     series: *series
-    charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
+    charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
     num_units: 1
     options:
       openstack-origin: *openstack-origin

src/tests/bundles/lunar-antelope.yaml

@@ -3,7 +3,7 @@ variables:
 
 local_overlay_enabled: False
 
-series: &series jammy
+series: &series lunar
 
 machines:
   '0':
@@ -47,7 +47,7 @@ applications:
 
   barbican:
     series: *series
-    charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
+    charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
     num_units: 1
     options:
       openstack-origin: *openstack-origin

src/tests/tests.yaml

@@ -1,14 +1,15 @@
 charm_name: barbican
 smoke_bundles:
-- jammy-yoga
-gate_bundles:
-- jammy-yoga
-dev_bundles:
-- jammy-yoga
 - jammy-zed
+gate_bundles:
+- jammy-zed
+dev_bundles:
+- jammy-antelope
 - kinetic-zed
+- lunar-antelope
 tests:
 - zaza.openstack.charm_tests.barbican.tests.BarbicanTest
 tests_options:
   force_deploy:
     - kinetic-zed
+    - lunar-antelope