From e2a35a6120f01bec2f539c900e04a19043012b40 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Wed, 29 Mar 2023 21:01:50 +0000
Subject: [PATCH] Enable jammy-antelope voting and drop kinetic-zed tests

* Voting was turned on for jammy-antelope in the
  project-template for charm-functional-jobs in zosci-config
* Voting for jammy-antelope bundles with non-standard names
  is turned on in individual charms
* Kinetic-zed bundles/tests are removed
* Add libpython3-dev to allow the charm to be built. This
  fixes a missing dependency with Cython
* Use local charm overlay for HA config instead of manually
  managing symlinks.

Change-Id: Iaee9a3792f5ba1b39b1ea030938c84d107d7d227
---
 charmcraft.yaml                               |   2 +
 src/tests/bundles/kinetic-zed.yaml            | 311 ------------------
 src/tests/bundles/overlays/jammy-yoga.yaml.j2 |   1 -
 src/tests/bundles/overlays/jammy-zed.yaml.j2  |   1 -
 .../bundles/overlays/kinetic-zed.yaml.j2      |   1 -
 ...{ironic.j2 => local-charm-overlay.yaml.j2} |   0
 src/tests/tests.yaml                          |   2 -
 7 files changed, 2 insertions(+), 316 deletions(-)
 delete mode 100644 src/tests/bundles/kinetic-zed.yaml
 delete mode 120000 src/tests/bundles/overlays/jammy-yoga.yaml.j2
 delete mode 120000 src/tests/bundles/overlays/jammy-zed.yaml.j2
 delete mode 120000 src/tests/bundles/overlays/kinetic-zed.yaml.j2
 rename src/tests/bundles/overlays/{ironic.j2 => local-charm-overlay.yaml.j2} (100%)

diff --git a/charmcraft.yaml b/charmcraft.yaml
index e34793a..00d4019 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -4,6 +4,8 @@ parts:
   charm:
     source: src/
     plugin: reactive
+    build-packages:
+      - libpython3-dev
     build-snaps:
       - charm
     build-environment:
diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/kinetic-zed.yaml
deleted file mode 100644
index 90e48ee..0000000
--- a/src/tests/bundles/kinetic-zed.yaml
+++ /dev/null
@@ -1,311 +0,0 @@
-options:
-  source: &source distro
-series: kinetic
-local_overlay_enabled: false
-relations:
-- - nova-ironic
-  - ironic-api
-- - ironic-conductor
-  - ironic-api
-- - neutron-ironic-agent:identity-credentials
-  - keystone
-- - neutron-ironic-agent
-  - neutron-api
-- - neutron-openvswitch
-  - neutron-api
-- - ironic-api:amqp
-  - rabbitmq-server:amqp
-- - ironic-api
-  - keystone
-- - ironic-api:shared-db
-  - ironic-api-mysql-router:shared-db
-- - ironic-conductor:amqp
-  - rabbitmq-server:amqp
-- - ironic-conductor
-  - keystone
-- - ironic-conductor:shared-db
-  - ironic-conductor-mysql-router:shared-db
-- - nova-ironic:amqp
-  - rabbitmq-server:amqp
-- - nova-ironic
-  - glance
-- - nova-ironic
-  - keystone
-- - nova-ironic
-  - nova-cloud-controller
-- - neutron-gateway:amqp
-  - rabbitmq-server:amqp
-- - keystone:shared-db
-  - keystone-mysql-router:shared-db
-- - nova-cloud-controller:identity-service
-  - keystone:identity-service
-- - glance:identity-service
-  - keystone:identity-service
-- - neutron-api:identity-service
-  - keystone:identity-service
-- - neutron-api:shared-db
-  - neutron-api-mysql-router:shared-db
-- - 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:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:image-service
-  - glance:image-service
-- - nova-cloud-controller:amqp
-  - rabbitmq-server:amqp
-- - nova-cloud-controller:quantum-network-service
-  - neutron-gateway:quantum-network-service
-- - nova-cloud-controller:shared-db
-  - nova-cloud-controller-mysql-router:shared-db
-- - nova-cloud-controller:neutron-api
-  - neutron-api:neutron-api
-- - cinder:image-service
-  - glance:image-service
-- - cinder:amqp
-  - rabbitmq-server:amqp
-- - cinder:identity-service
-  - keystone:identity-service
-- - cinder:cinder-volume-service
-  - nova-cloud-controller:cinder-volume-service
-- - cinder:shared-db
-  - cinder-mysql-router:shared-db
-- - placement:shared-db
-  - placement-mysql-router:shared-db
-- - placement
-  - keystone
-- - placement
-  - nova-cloud-controller
-- - ceph-mon:client
-  - nova-ironic:ceph
-- - ceph-mon:client
-  - glance:ceph
-- - ceph-radosgw:mon
-  - ceph-mon:radosgw
-- - ceph-radosgw:identity-service
-  - keystone:identity-service
-- - ceph-osd:mon
-  - ceph-mon:osd
-- - ceph-radosgw:object-store
-  - glance
-- - mysql-innodb-cluster:db-router
-  - nova-cloud-controller-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - keystone-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - glance-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - neutron-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - placement-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - cinder-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-api-mysql-router:db-router
-- - mysql-innodb-cluster:db-router
-  - ironic-conductor-mysql-router:db-router
-- - vault-mysql-router:db-router
-  - mysql-innodb-cluster:db-router
-- - vault:shared-db
-  - vault-mysql-router:shared-db
-- - vault:certificates
-  - ceph-radosgw
-- - vault:certificates
-  - cinder
-- - vault:certificates
-  - glance:certificates
-- - vault:certificates
-  - keystone:certificates
-- - vault:certificates
-  - neutron-api:certificates
-- - vault:certificates
-  - nova-cloud-controller:certificates
-- - vault:certificates
-  - placement:certificates
-- - vault
-  - ironic-conductor
-- - vault:certificates
-  - ironic-api:certificates
-- - ironic-api
-  - hacluster-ironic
-services:
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  cinder-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ironic-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  ironic-conductor-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    constraints: mem=4G
-    options:
-      source: *source
-    channel: latest/edge
-  cinder:
-    charm: ch:cinder
-    num_units: 1
-    constraints: mem=2G
-    options:
-      block-device: vdb
-      glance-api-version: 2
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    storage:
-      block-devices: cinder,50G
-    channel: latest/edge
-  ceph-radosgw:
-    charm: ch:ceph-radosgw
-    num_units: 1
-    constraints: mem=2G
-    options:
-      source: *source
-      namespace-tenants: True
-    channel: latest/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    constraints: mem=2G
-    options:
-      expected-osd-count: 3
-      source: *source
-    channel: latest/edge
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    constraints: mem=2G
-    options:
-      source: *source
-    storage:
-      osd-devices: 'cinder,30G'
-    channel: latest/edge
-  glance:
-    charm: ch:glance
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    constraints: mem=2G
-    options:
-      flat-network-providers: "physnet1"
-      neutron-security-groups: true
-      openstack-origin: *source
-      manage-neutron-plugin-legacy-mode: false
-      worker-multiplier: 0.25
-    channel: latest/edge
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      enable-isolated-metadata: true
-      enable-metadata-network: true
-      bridge-mappings: physnet1:br-ex
-    channel: latest/edge
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    constraints: mem=2G
-    options:
-      network-manager: Neutron
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  nova-ironic:
-    charm: ch:nova-compute
-    num_units: 1
-    constraints: mem=2G
-    options:
-      enable-live-migration: false
-      enable-resize: false
-      openstack-origin: *source
-      virt-type: ironic
-    channel: latest/edge
-  placement:
-    charm: ch:placement
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      worker-multiplier: 0.25
-    channel: latest/edge
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    constraints: mem=2G
-    channel: latest/edge
-  hacluster-ironic:
-    charm: ch:hacluster
-    num_units: 0
-    channel: latest/edge
-  ironic-api:
-    charm: ch:ironic-api
-    num_units: 3
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-    channel: latest/edge
-  ironic-conductor:
-    charm: ch:ironic-conductor
-    num_units: 1
-    constraints: mem=2G
-    options:
-      openstack-origin: *source
-      max-tftp-block-size: 1418
-      disable-secure-erase: true
-      use-ipxe: true
-      enabled-network-interfaces: "flat, noop"
-    channel: latest/edge
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    num_units: 0
-    options:
-      bridge-mappings: physnet1:br-ex
-    channel: latest/edge
-  neutron-ironic-agent:
-    charm: ../../../neutron-api-plugin-ironic.charm
-    num_units: 0
-    options:
-      openstack-origin: *source
-  vault:
-    charm: ch:vault
-    num_units: 1
-    channel: latest/edge
diff --git a/src/tests/bundles/overlays/jammy-yoga.yaml.j2 b/src/tests/bundles/overlays/jammy-yoga.yaml.j2
deleted file mode 120000
index f07f22d..0000000
--- a/src/tests/bundles/overlays/jammy-yoga.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-ironic.j2
\ No newline at end of file
diff --git a/src/tests/bundles/overlays/jammy-zed.yaml.j2 b/src/tests/bundles/overlays/jammy-zed.yaml.j2
deleted file mode 120000
index f07f22d..0000000
--- a/src/tests/bundles/overlays/jammy-zed.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-ironic.j2
\ No newline at end of file
diff --git a/src/tests/bundles/overlays/kinetic-zed.yaml.j2 b/src/tests/bundles/overlays/kinetic-zed.yaml.j2
deleted file mode 120000
index f07f22d..0000000
--- a/src/tests/bundles/overlays/kinetic-zed.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-ironic.j2
\ No newline at end of file
diff --git a/src/tests/bundles/overlays/ironic.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2
similarity index 100%
rename from src/tests/bundles/overlays/ironic.j2
rename to src/tests/bundles/overlays/local-charm-overlay.yaml.j2
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 4c4aaf7..345176e 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -8,7 +8,6 @@ gate_bundles:
 
 dev_bundles:
 - jammy-antelope
-- kinetic-zed
 - lunar-antelope
 
 smoke_bundles:
@@ -43,5 +42,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - kinetic-zed
     - lunar-antelope