From 404e52b0ec48e6c4736c6857458afaa4140b0dcb 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: Iae2de09cab79f159f468aec99b824dd95d01a46e
---
 .zuul.yaml                                    |   2 +-
 charmcraft.yaml                               |  12 +
 osci.yaml                                     |   2 +-
 src/metadata.yaml                             |   1 +
 src/tests/bundles/jammy-antelope.yaml         | 416 ++++++++++++++++++
 src/tests/bundles/jammy-zed.yaml              |   2 +-
 src/tests/bundles/kinetic-zed.yaml            |   2 +-
 .../{jammy-yoga.yaml => lunar-antelope.yaml}  |   4 +-
 src/tests/tests.yaml                          |   9 +-
 9 files changed, 440 insertions(+), 10 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 4c7e885..8308441 100644
--- a/charmcraft.yaml
+++ b/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]
diff --git a/osci.yaml b/osci.yaml
index 4840e4b..250bd2c 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: masakari-monitors
diff --git a/src/metadata.yaml b/src/metadata.yaml
index 5f499e8..5cfaf7f 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -9,6 +9,7 @@ tags:
 series:
 - jammy
 - kinetic
+- lunar
 requires:
   identity-credentials:
     interface: keystone-credentials
diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-antelope.yaml
new file mode 100644
index 0000000..cfbe7c6
--- /dev/null
+++ b/src/tests/bundles/jammy-antelope.yaml
@@ -0,0 +1,416 @@
+variables:
+  openstack-origin: &openstack-origin cloud:jammy-antelope
+
+local_overlay_enabled: True
+
+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':
+  '6':
+  '7':
+  '8':
+    constraints: mem=4096M
+  '9':
+    constraints: mem=4096M
+  '10':
+    constraints: mem=4096M
+  '11':
+  '12':
+  '13':
+  '14':
+  '15':
+  '16':
+  '17':
+  '18':
+  '19':
+  '20':
+  '21':
+  '22':
+  '23':
+
+applications:
+
+  keystone-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  cinder-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  neutron-api-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  glance-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  nova-cloud-controller-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  masakari-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  vault-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+  placement-mysql-router:
+    charm: ch:mysql-router
+    channel: latest/edge
+
+  mysql-innodb-cluster:
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
+    to:
+      - '0'
+      - '1'
+      - '2'
+    channel: latest/edge
+
+  glance:
+    charm: ch:glance
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      worker-multiplier: 0.25
+    to:
+      - '3'
+    channel: latest/edge
+
+  cinder:
+    charm: ch:cinder
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+      block-device: "None"
+      glance-api-version: 2
+    to:
+      - '4'
+    channel: latest/edge
+
+  keystone:
+    charm: ch:keystone
+    num_units: 1
+    options:
+      admin-password: openstack
+      openstack-origin: *openstack-origin
+      worker-multiplier: 0.25
+    to:
+      - '5'
+    channel: latest/edge
+
+  neutron-api:
+    charm: ch:neutron-api
+    num_units: 1
+    options:
+      manage-neutron-plugin-legacy-mode: true
+      flat-network-providers: physnet1
+      neutron-security-groups: true
+      openstack-origin: *openstack-origin
+      worker-multiplier: 0.25
+    to:
+      - '6'
+    channel: latest/edge
+
+  neutron-gateway:
+    charm: ch:neutron-gateway
+    num_units: 1
+    options:
+      bridge-mappings: physnet1:br-ex
+      openstack-origin: *openstack-origin
+      worker-multiplier: 0.25
+    to:
+      - '7'
+    channel: latest/edge
+
+  neutron-openvswitch:
+    charm: ch:neutron-openvswitch
+    num_units: 0
+    channel: latest/edge
+
+  nova-cloud-controller:
+    charm: ch:nova-cloud-controller
+    num_units: 1
+    options:
+      network-manager: Neutron
+      openstack-origin: *openstack-origin
+      worker-multiplier: 0.25
+      debug: true
+    to:
+      - '23'
+    channel: latest/edge
+
+  nova-compute:
+    charm: ch:nova-compute
+    num_units: 3
+    constraints: mem=4G
+    options:
+      config-flags: default_ephemeral_format=ext4
+      enable-live-migration: true
+      enable-resize: true
+      migration-auth-type: ssh
+      openstack-origin: *openstack-origin
+      debug: true
+      cpu-model: kvm64
+      cpu-mode: custom
+      # Allow for more retries when testing ontop of openstack
+      config-flags: block_device_allocate_retries=120
+    to:
+      - '8'
+      - '9'
+      - '10'
+    channel: latest/edge
+
+  rabbitmq-server:
+    charm: ch:rabbitmq-server
+    num_units: 1
+    to:
+      - '11'
+    channel: latest/edge
+
+  masakari:
+    charm: ch:masakari
+    num_units: 3
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '12'
+      - '13'
+      - '14'
+    channel: latest/edge
+
+  ceph-mon:
+    charm: ch:ceph-mon
+    num_units: 3
+    options:
+      source: *openstack-origin
+      expected-osd-count: 3
+    to:
+      - '15'
+      - '16'
+      - '17'
+    channel: latest/edge
+
+  ceph-osd:
+    charm: ch:ceph-osd
+    constraints: mem=1G
+    num_units: 3
+    options:
+      source: *openstack-origin
+    storage:
+      osd-devices:  cinder,40G
+    to:
+      - '18'
+      - '19'
+      - '20'
+    channel: latest/edge
+
+  cinder-ceph:
+    charm: ch:cinder-ceph
+    channel: latest/edge
+
+  masakari-monitors:
+    charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
+
+  hacluster:
+    charm: ch:hacluster
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+    channel: latest/edge
+
+  pacemaker-remote:
+    charm: ch:pacemaker-remote
+    options:
+      enable-stonith: False
+      enable-resources: False
+    channel: latest/edge
+
+  vault:
+    num_units: 1
+    charm: ch:vault
+    to:
+      - '21'
+    channel: latest/edge
+
+  placement:
+    charm: ch:placement
+    num_units: 1
+    options:
+      openstack-origin: *openstack-origin
+    to:
+      - '22'
+    channel: latest/edge
+
+relations:
+
+  - - 'nova-compute:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-gateway:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-gateway:amqp-nova'
+    - 'rabbitmq-server:amqp'
+
+  - - 'keystone:shared-db'
+    - 'keystone-mysql-router:shared-db'
+  - - 'keystone-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'cinder:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'nova-cloud-controller:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-api:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'neutron-openvswitch:neutron-plugin-api'
+    - 'neutron-api:neutron-plugin-api'
+
+  - - 'cinder:shared-db'
+    - 'cinder-mysql-router:shared-db'
+  - - 'cinder-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'neutron-api:shared-db'
+    - 'neutron-api-mysql-router:shared-db'
+  - - 'neutron-api-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'cinder:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-api:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'neutron-gateway:neutron-plugin-api'
+    - 'neutron-api:neutron-plugin-api'
+
+  - - 'glance:shared-db'
+    - 'glance-mysql-router:shared-db'
+  - - 'glance-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'glance:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-compute:image-service'
+    - 'glance:image-service'
+
+  - - 'nova-cloud-controller:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:quantum-network-service'
+    - 'neutron-gateway:quantum-network-service'
+
+  - - 'nova-compute:neutron-plugin'
+    - 'neutron-openvswitch:neutron-plugin'
+
+  - - 'neutron-openvswitch:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'nova-cloud-controller:shared-db'
+    - 'nova-cloud-controller-mysql-router:shared-db'
+  - - 'nova-cloud-controller-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'nova-cloud-controller:neutron-api'
+    - 'neutron-api:neutron-api'
+
+  - - 'nova-cloud-controller:cloud-compute'
+    - 'nova-compute:cloud-compute'
+
+  - - 'masakari:shared-db'
+    - 'masakari-mysql-router:shared-db'
+  - - 'masakari-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'masakari:amqp'
+    - 'rabbitmq-server:amqp'
+
+  - - 'masakari:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'glance:ceph'
+    - 'ceph-mon:client'
+
+  - - 'ceph-mon:osd'
+    - 'ceph-osd:mon'
+
+  - - 'cinder:storage-backend'
+    - 'cinder-ceph:storage-backend'
+
+  - - 'cinder-ceph:ceph'
+    - 'ceph-mon:client'
+
+  - - 'cinder-ceph:ceph-access'
+    - 'nova-compute:ceph-access'
+
+  - - 'nova-compute:juju-info'
+    - 'masakari-monitors:container'
+
+  - - 'masakari:ha'
+    - 'hacluster:ha'
+
+  - - 'keystone:identity-credentials'
+    - 'masakari-monitors:identity-credentials'
+
+  - - 'nova-compute:juju-info'
+    - 'pacemaker-remote:juju-info'
+
+  - - 'hacluster:pacemaker-remote'
+    - 'pacemaker-remote:pacemaker-remote'
+
+  - - 'vault:shared-db'
+    - 'vault-mysql-router:shared-db'
+  - - 'vault-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'vault:certificates'
+    - 'keystone:certificates'
+
+  - - 'vault:certificates'
+    - 'neutron-api:certificates'
+
+  - - 'vault:certificates'
+    - 'cinder:certificates'
+
+  - - 'vault:certificates'
+    - 'glance:certificates'
+
+  - - 'vault:certificates'
+    - 'nova-cloud-controller:certificates'
+
+  - - 'vault:certificates'
+    - 'masakari:certificates'
+
+  - - 'placement:shared-db'
+    - 'placement-mysql-router:shared-db'
+  - - 'placement-mysql-router:db-router'
+    - 'mysql-innodb-cluster:db-router'
+
+  - - 'placement:identity-service'
+    - 'keystone:identity-service'
+
+  - - 'placement:placement'
+    - 'nova-cloud-controller:placement'
+
+  - - 'vault:certificates'
+    - 'placement:certificates'
diff --git a/src/tests/bundles/jammy-zed.yaml b/src/tests/bundles/jammy-zed.yaml
index 4015a23..b82ca16 100644
--- a/src/tests/bundles/jammy-zed.yaml
+++ b/src/tests/bundles/jammy-zed.yaml
@@ -218,7 +218,7 @@ applications:
     channel: latest/edge
 
   masakari-monitors:
-    charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
+    charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
 
   hacluster:
     charm: ch:hacluster
diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/kinetic-zed.yaml
index 3dbba00..0140124 100644
--- a/src/tests/bundles/kinetic-zed.yaml
+++ b/src/tests/bundles/kinetic-zed.yaml
@@ -218,7 +218,7 @@ applications:
     channel: latest/edge
 
   masakari-monitors:
-    charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
+    charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
 
   hacluster:
     charm: ch:hacluster
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 a773733..a90f963 100644
--- a/src/tests/bundles/jammy-yoga.yaml
+++ b/src/tests/bundles/lunar-antelope.yaml
@@ -3,7 +3,7 @@ variables:
 
 local_overlay_enabled: True
 
-series: jammy
+series: lunar
 
 comment:
 - 'machines section to decide order of deployment. database sooner = faster'
@@ -218,7 +218,7 @@ applications:
     channel: latest/edge
 
   masakari-monitors:
-    charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm
+    charm: ../../../masakari-monitors_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
 
   hacluster:
     charm: ch:hacluster
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 6607aa6..2c4dc96 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -13,17 +13,17 @@ configure:
   - zaza.openstack.charm_tests.masakari.setup.create_segments
 
 gate_bundles:
-  - jammy-yoga
+  - jammy-zed
 
 dev_bundles:
 # Rocky disabled until https://review.opendev.org/#/c/647756/ lands in
 # packaging
-  - jammy-yoga
-  - jammy-zed
+  - jammy-antelope
   - kinetic-zed
+  - lunar-antelope
 
 smoke_bundles:
-  - jammy-yoga
+  - jammy-zed
 
 target_deploy_status:
   easyrsa:
@@ -45,3 +45,4 @@ target_deploy_status:
 tests_options:
   force_deploy:
     - kinetic-zed
+    - lunar-antelope