From 30630eba2eccb6b93cf8e4ed39513aefbb405c0c Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Tue, 14 Feb 2023 21:26:01 +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: I325ec88ff5033615fbf68334c08ef63e23bbe245
---
 .zuul.yaml                                    |  2 +-
 charmcraft.yaml                               |  3 +
 osci.yaml                                     |  2 +-
 src/metadata.yaml                             |  1 +
 src/tests/bundles/jammy-antelope.yaml         | 97 +++++++++++++++++++
 .../{jammy-yoga.yaml => lunar-antelope.yaml}  |  2 +-
 src/tests/tests.yaml                          | 11 ++-
 tox.ini                                       |  2 +-
 8 files changed, 111 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 7c97346..3274143 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: manila-generic
diff --git a/src/metadata.yaml b/src/metadata.yaml
index b1221fa..a918e7c 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -17,6 +17,7 @@ tags:
 series:
 - jammy
 - kinetic
+- lunar
 subordinate: true
 provides:
   manila-plugin:
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
new file mode 100644
index 0000000..c3330d8
--- /dev/null
+++ b/src/tests/bundles/jammy-antelope.yaml
@@ -0,0 +1,97 @@
+variables:
+  openstack-origin: &openstack-origin cloud:jammy-antelope
+
+local_overlay_enabled: False
+
+series: jammy
+
+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':
+
+services:
+
+  manila-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  keystone-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
+
+  manila:
+    charm: ch:manila
+    num_units: 1
+    options:
+      default-share-backend: generic
+      openstack-origin: *openstack-origin
+    to:
+      - '3'
+    channel: latest/edge
+
+  manila-generic:
+    charm: ../../../manila-generic.charm
+    options:
+      driver-handles-share-servers: False
+
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+      - '4'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '5'
+    channel: latest/edge
+  nrpe:
+    charm: ch:nrpe
+    channel: latest/edge
+
+relations:
+
+  - - 'manila:shared-db'
+    - 'manila-mysql-router:shared-db'
+  - - 'manila-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'manila:manila-plugin'
+    - 'manila-generic'
+
+  - - 'manila'
+    - 'rabbitmq-server'
+
+  - - 'manila'
+    - 'keystone'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nrpe:nrpe-external-master'
+    - 'manila:nrpe-external-master'
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 567f646..b5f47db 100644
--- a/src/tests/bundles/jammy-yoga.yaml
+++ b/src/tests/bundles/lunar-antelope.yaml
@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: jammy
+series: lunar
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 160346e..59e472b 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -1,15 +1,15 @@
 charm_name: manila-generic
 
 gate_bundles:
-  - jammy-yoga
+  - jammy-zed
 
 smoke_bundles:
-  - jammy-yoga
+  - jammy-zed
 
 dev_bundles:
-  - jammy-yoga
-  - jammy-zed
+  - jammy-antelope
   - kinetic-zed
+  - lunar-antelope
 
 target_deploy_status: {}
 
@@ -24,5 +24,6 @@ tests_options:
     # nrpe charm doesn't support jammy+ and needs to be force installed
     # https://bugs.launchpad.net/charm-nrpe/+bug/1968008
     - jammy-zed
-    - jammy-yoga
+    - jammy-antelope
     - 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