From bcfbc55b45d3cb3ab42bf6cae35c58f936f56003 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Wed, 29 Mar 2023 21:01:47 +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

Change-Id: Ic07c734001c56f26d6980934005ea8cad8588c4f
---
 src/tests/bundles/kinetic-zed.yaml | 81 ------------------------------
 src/tests/tests.yaml               |  2 -
 2 files changed, 83 deletions(-)
 delete mode 100644 src/tests/bundles/kinetic-zed.yaml

diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/kinetic-zed.yaml
deleted file mode 100644
index 5ed96c7..0000000
--- a/src/tests/bundles/kinetic-zed.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: False
-
-series: &series kinetic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  barbican-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
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-    channel: latest/edge
-
-  barbican:
-    series: *series
-    charm: ../../../barbican_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: true
-    to:
-      - '4'
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '5'
-    channel: latest/edge
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'barbican:shared-db'
-    - 'barbican-mysql-router:shared-db'
-  - - 'barbican-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone:identity-service'
-    - 'barbican:identity-service'
-
-  - - 'rabbitmq-server:amqp'
-    - 'barbican:amqp'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index bccd764..60aa01b 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -5,11 +5,9 @@ gate_bundles:
 - jammy-zed
 dev_bundles:
 - jammy-antelope
-- kinetic-zed
 - lunar-antelope
 tests:
 - zaza.openstack.charm_tests.barbican.tests.BarbicanTest
 tests_options:
   force_deploy:
-    - kinetic-zed
     - lunar-antelope