From 8287e5a0c50bdf281ce5c3c233f967f2e8f7a7c7 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

Change-Id: I6e549bd4611517f363d7df905e3af0ccdf0727ba
---
 src/tests/bundles/kinetic-zed.yaml | 145 -----------------------------
 src/tests/tests.yaml               |   2 -
 2 files changed, 147 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 89820f9..0000000
--- a/src/tests/bundles/kinetic-zed.yaml
+++ /dev/null
@@ -1,145 +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':
-  '7':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  octavia-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  openstack-dashboard-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
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-      - '4'
-    channel: latest/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      neutron-security-groups: True
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-    channel: latest/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    num_units: 0
-    channel: latest/edge
-
-  octavia:
-    charm: ch:octavia
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-    channel: latest/edge
-
-  openstack-dashboard:
-    charm: ch:openstack-dashboard
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '7'
-    channel: latest/edge
-
-  octavia-dashboard:
-     charm: ../../../octavia-dashboard_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-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'
-
-  - - 'octavia:shared-db'
-    - 'octavia-mysql-router:shared-db'
-  - - 'octavia-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'openstack-dashboard:shared-db'
-    - 'openstack-dashboard-mysql-router:shared-db'
-  - - 'openstack-dashboard-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'keystone:identity-service'
-    - 'neutron-api:identity-service'
-
-  - - 'keystone:identity-service'
-    - 'octavia:identity-service'
-
-  - - 'keystone:identity-service'
-    - 'openstack-dashboard:identity-service'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-api:amqp'
-
-  - - 'rabbitmq-server:amqp'
-    - 'octavia:amqp'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'
-
-  - - 'neutron-openvswitch:neutron-plugin'
-    - 'octavia:neutron-openvswitch'
-
-  - - 'openstack-dashboard:dashboard-plugin'
-    - 'octavia-dashboard:dashboard'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 31fd7e1..c40a808 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -8,7 +8,6 @@ smoke_bundles:
 
 dev_bundles:
 - jammy-antelope
-- kinetic-zed
 - lunar-antelope
 
 comment:
@@ -26,5 +25,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - kinetic-zed
     - lunar-antelope