From be8600d97cf6d77a8a1b7a65a10ed40c6963671a Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Wed, 29 Mar 2023 21:01:49 +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: I18f3112b7fca0e6af35aa4f6231b9ca9a5414a3e
---
 tests/bundles/kinetic-zed.yaml | 70 ----------------------------------
 tests/tests.yaml               |  2 -
 2 files changed, 72 deletions(-)
 delete mode 100644 tests/bundles/kinetic-zed.yaml

diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml
deleted file mode 100644
index df846071..00000000
--- a/tests/bundles/kinetic-zed.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: kinetic
-
-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':
-
-applications:
-
-  glance-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
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  keystone:
-    charm: ../../keystone.charm
-    num_units: 3
-    options:
-      openstack-origin: *openstack-origin
-      token-provider: 'fernet'
-      token-expiration: 300
-    to:
-    - '3'
-    - '4'
-    - '5'
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '6'
-    channel: latest/edge
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
diff --git a/tests/tests.yaml b/tests/tests.yaml
index ebda6f97..3673ea6e 100644
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -8,7 +8,6 @@ gate_bundles:
 
 dev_bundles:
 - jammy-antelope
-- kinetic-zed
 - lunar-antelope
 
 comment: |
@@ -40,7 +39,6 @@ tests_options:
   policyd:
     service: keystone
   force_deploy:
-    - kinetic-zed
     - lunar-antelope
 target_deploy_status:
   vault: