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: I299ad73b99082befdb37e6c0897c4f9abcc44ba5

.zuul.yaml

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

charmcraft.yaml

@@ -32,3 +32,6 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [amd64, s390x, ppc64el, arm64]

metadata.yaml

@@ -12,6 +12,7 @@ tags:
 series:
   - jammy
   - kinetic
+  - lunar
 subordinate: true
 provides:
   storage-backend:

osci.yaml

@@ -2,7 +2,7 @@
     templates:
       - charm-unit-jobs-py310
       # Does not have working functional tests. Virtual appliance doesn't exist yet.
-      # - charm-zed-functional-jobs
+      # - charm-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: cinder-nimblestorage

test-requirements.txt

@@ -1,7 +1,6 @@
 # This file is managed centrally.  If you find the need to modify this as a
 # one-off, please don't.  Intead, consult #openstack-charms and ask about
 # requirements management in charms via bot-control.  Thank you.
-charm-tools>=2.4.4
 coverage>=3.6
 mock>=1.2
 flake8>=4.0.1

tests/bundles/jammy-antelope.yaml

@@ -0,0 +1,87 @@
+series: jammy
+variables:
+  openstack-origin: &openstack-origin cloud:jammy-antelope
+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':
+    constraints: mem=4G root-disk=16G
+
+applications:
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    channel: latest/edge
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    channel: latest/edge
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '3'
+  keystone:
+    charm: ch:keystone
+    channel: latest/edge
+    options:
+      openstack-origin: *openstack-origin
+    num_units: 1
+    to:
+      - '4'
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  cinder:
+    charm: ch:cinder
+    channel: latest/edge
+    num_units: 1
+    storage:
+      block-devices: '40G'
+    options:
+      openstack-origin: *openstack-origin
+      block-device: None
+      overwrite: "true"
+    to:
+      - '5'
+
+  cinder-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+
+  cinder-nimblestorage:
+    charm: ../../cinder-nimblestorage.charm
+    options:
+      volume-driver: 'iscsi'
+      volume-backend-name: 'cinder-nimblestorage'
+      use-multipath-for-image-xfer: True
+      encryption: 'yes'
+      performance-policy-name: 'test-performance-policy'
+      multi-initiator: True
+      pool-name: 'default'
+      subnet-label: '*'
+      verify-cert-path: 'None'
+      verify-cert: 'False'
+
+relations:
+  - [ keystone:shared-db, keystone-mysql-router:shared-db ]
+  - [ keystone-mysql-router:db-router, mysql-innodb-cluster:db-router ]
+  - [ cinder:shared-db, cinder-mysql-router:shared-db ]
+  - [ cinder-mysql-router:db-router, mysql-innodb-cluster:db-router ]
+  - [ cinder:identity-service, keystone:identity-service ]
+  - [ cinder:amqp, rabbitmq-server:amqp ]
+  - [ cinder:storage-backend, cinder-nimblestorage:storage-backend ]

tests/bundles/jammy-zed.yaml

@@ -0,0 +1,87 @@
+series: jammy
+variables:
+  openstack-origin: &openstack-origin cloud:jammy-zed
+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':
+    constraints: mem=4G root-disk=16G
+
+applications:
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    channel: latest/edge
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    channel: latest/edge
+    num_units: 1
+    options:
+      source: *openstack-origin
+    to:
+      - '3'
+  keystone:
+    charm: ch:keystone
+    channel: latest/edge
+    options:
+      openstack-origin: *openstack-origin
+    num_units: 1
+    to:
+      - '4'
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  cinder:
+    charm: ch:cinder
+    channel: latest/edge
+    num_units: 1
+    storage:
+      block-devices: '40G'
+    options:
+      openstack-origin: *openstack-origin
+      block-device: None
+      overwrite: "true"
+    to:
+      - '5'
+
+  cinder-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+
+  cinder-nimblestorage:
+    charm: ../../cinder-nimblestorage.charm
+    options:
+      volume-driver: 'iscsi'
+      volume-backend-name: 'cinder-nimblestorage'
+      use-multipath-for-image-xfer: True
+      encryption: 'yes'
+      performance-policy-name: 'test-performance-policy'
+      multi-initiator: True
+      pool-name: 'default'
+      subnet-label: '*'
+      verify-cert-path: 'None'
+      verify-cert: 'False'
+
+relations:
+  - [ keystone:shared-db, keystone-mysql-router:shared-db ]
+  - [ keystone-mysql-router:db-router, mysql-innodb-cluster:db-router ]
+  - [ cinder:shared-db, cinder-mysql-router:shared-db ]
+  - [ cinder-mysql-router:db-router, mysql-innodb-cluster:db-router ]
+  - [ cinder:identity-service, keystone:identity-service ]
+  - [ cinder:amqp, rabbitmq-server:amqp ]
+  - [ cinder:storage-backend, cinder-nimblestorage:storage-backend ]

tests/bundles/lunar-antelope.yaml

@@ -1,4 +1,4 @@
-series: jammy
+series: lunar
 variables:
   openstack-origin: &openstack-origin distro
 comment:

tests/tests.yaml

@@ -4,13 +4,14 @@ tests:
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 gate_bundles:
-  - jammy-yoga
-dev_bundles:
-  - jammy-yoga
   - jammy-zed
+dev_bundles:
+  - jammy-antelope
   - kinetic-zed
+  - lunar-antelope
 smoke_bundles:
-  - jammy-yoga
+  - jammy-zed
 tests_options:
   force_deploy:
     - kinetic-zed
+    - lunar-antelope

tox.ini

@@ -33,7 +33,7 @@ allowlist_externals =
     charmcraft
     bash
     tox
-    rename.sh
+    {toxinidir}/rename.sh
 deps =
     -r{toxinidir}/requirements.txt