From b657a63abdb1990ece815805d2d3e1632f66afa4 Mon Sep 17 00:00:00 2001
From: Corey Bryant <corey.bryant@canonical.com>
Date: Wed, 29 Mar 2023 21:01:48 +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: I3f9c253a89906b8f1dde4f60f1fdc30119a8d31c
---
 src/tests/bundles/kinetic-zed.yaml | 139 -----------------------------
 src/tests/tests.yaml               |   2 -
 2 files changed, 141 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 5862655..0000000
--- a/src/tests/bundles/kinetic-zed.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: False
-
-series: kinetic
-
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-    series: focal
-  '8':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  designate-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-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
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    to:
-    - '3'
-    channel: latest/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-    - '4'
-    channel: latest/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      openstack-origin: *openstack-origin
-    to:
-    - '5'
-    channel: latest/edge
-
-  designate-bind:
-    charm: ch:designate-bind
-    num_units: 1
-    # NOTE(ajkavanagh) apparently it has no openstack origin!
-    #options:
-      #openstack-origin: *openstack-origin
-    to:
-    - '6'
-    channel: latest/edge
-
-  memcached:
-    charm: ch:memcached
-    num_units: 1
-    # Note that holding memcached at focal as it's not available at kinetic yet.
-    series: focal
-    to:
-    - '7'
-
-  designate:
-    charm: ../../../designate_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
-    num_units: 1
-    options:
-      nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.'
-      openstack-origin: *openstack-origin
-    to:
-    - '8'
-
-  nrpe:
-    charm: ch:nrpe
-    channel: latest/edge
-
-relations:
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'designate:shared-db'
-    - 'designate-mysql-router:shared-db'
-  - - 'designate-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'designate:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'designate:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'designate:dns-backend'
-    - 'designate-bind:dns-backend'
-
-  - - 'designate:coordinator-memcached'
-    - 'memcached:cache'
-
-  - - 'designate:dnsaas'
-    - 'neutron-api:external-dns'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'neutron-api:shared-db'
-    - 'neutron-api-mysql-router:shared-db'
-  - - 'neutron-api-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'designate:nrpe-external-master'
-    - 'nrpe:nrpe-external-master'
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index c56cef2..0b580c8 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
 
 tests:
@@ -25,5 +24,4 @@ tests_options:
     # https://bugs.launchpad.net/charm-nrpe/+bug/1968008
     - jammy-zed
     - jammy-antelope
-    - kinetic-zed
     - lunar-antelope