From a7befbfca3964959477feaa77957202d2b3bfc2e Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 14 Feb 2023 21:26:00 +0000
Subject: [PATCH] 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: Iddd46789ba26fbed9afb6d5a5badc1fdda08dddd
---
 .zuul.yaml                                    |  2 +-
 charmcraft.yaml                               |  3 +
 osci.yaml                                     |  2 +-
 src/metadata.yaml                             |  1 +
 src/tests/bundles/jammy-antelope.yaml         | 82 +++++++++++++++++++
 .../{jammy-yoga.yaml => lunar-antelope.yaml}  |  2 +-
 src/tests/tests.yaml                          | 11 +--
 tox.ini                                       |  2 +-
 8 files changed, 96 insertions(+), 9 deletions(-)
 create mode 100644 src/tests/bundles/jammy-antelope.yaml
 rename src/tests/bundles/{jammy-yoga.yaml => lunar-antelope.yaml} (99%)

diff --git a/.zuul.yaml b/.zuul.yaml
index 23bf5f6..fd20909 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-zed-jobs
+      - openstack-python3-charm-jobs
       - openstack-cover-jobs
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 0604425..e34793a 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -23,3 +23,6 @@ bases:
       - name: ubuntu
         channel: "22.10"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "23.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
diff --git a/osci.yaml b/osci.yaml
index c34c464..aaa196c 100644
--- a/osci.yaml
+++ b/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: cinder-netapp
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 271bca7..840153d 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -13,6 +13,7 @@ tags:
 series:
   - jammy
   - kinetic
+  - lunar
 subordinate: true
 provides:
   storage-backend:
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
new file mode 100644
index 0000000..e3c71a9
--- /dev/null
+++ b/src/tests/bundles/jammy-antelope.yaml
@@ -0,0 +1,82 @@
+series: jammy
+local_overlay_enabled: False
+
+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
+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-netapp:storage-backend
+applications:
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    options:
+      source: *openstack-origin
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: latest/edge
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+      - '3'
+    channel: latest/edge
+  keystone:
+    charm: ch:keystone
+    options:
+      openstack-origin: *openstack-origin
+    num_units: 1
+    to:
+      - '4'
+    channel: latest/edge
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  cinder:
+    charm: ch:cinder
+    storage:
+      block-devices: '40G'
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      block-device: None
+      overwrite: "true"
+    to:
+      - '5'
+    channel: latest/edge
+  cinder-netapp:
+    charm: ../../../cinder-netapp.charm
+    options:
+      netapp-storage-family: ontap_cluster
+      netapp-storage-protocol: iscsi
+      volume-backend-name: NETAPP
+  cinder-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/lunar-antelope.yaml
similarity index 99%
rename from src/tests/bundles/jammy-yoga.yaml
rename to src/tests/bundles/lunar-antelope.yaml
index d8cb7c1..1c301a8 100644
--- a/src/tests/bundles/jammy-yoga.yaml
+++ b/src/tests/bundles/lunar-antelope.yaml
@@ -1,4 +1,4 @@
-series: jammy
+series: lunar
 local_overlay_enabled: False
 
 variables:
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 4eccc42..611b02d 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -4,13 +4,14 @@ tests:
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 gate_bundles:
-  - jammy-yoga
-smoke_bundles:
-  - jammy-yoga
-dev_bundles:
-  - jammy-yoga
   - jammy-zed
+smoke_bundles:
+  - jammy-zed
+dev_bundles:
+  - jammy-antelope
   - kinetic-zed
+  - lunar-antelope
 test_options:
   force_deploy:
     - kinetic-zed
+    - lunar-antelope
diff --git a/tox.ini b/tox.ini
index 854d8be..c11375e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -33,7 +33,7 @@ allowlist_externals =
     charmcraft
     bash
     tox
-    rename.sh
+    {toxinidir}/rename.sh
 deps =
     -r{toxinidir}/requirements.txt