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: I463ac3b04112941489a5211f75e8e24db0aa82e0

osci.yaml

@@ -5,10 +5,7 @@
     check:
       jobs:
       - test-s3-jammy-zed-s3
-      - test-s3-kinetic-zed-s3:
-          voting: false
-      - test-s3-jammy-antelope-s3:
-          voting: false
+      - test-s3-jammy-antelope-s3
       - test-s3-lunar-antelope-s3:
           voting: false
     vars:
@@ -24,13 +21,6 @@
       - jammy-zed
     vars:
       tox_extra_args: '-- test-s3:jammy-zed-s3'
-- job:
-    name: test-s3-kinetic-zed-s3
-    parent: func-target
-    dependencies:
-      - jammy-zed
-    vars:
-      tox_extra_args: '-- test-s3:kinetic-zed-s3'
 - job:
     name: test-s3-jammy-antelope-s3
     parent: func-target

src/tests/bundles/jammy-antelope-s3.yaml

@@ -1,9 +1,9 @@
 variables:
-  openstack-origin: &openstack-origin distro
+  openstack-origin: &openstack-origin cloud:jammy-antelope
 
 local_overlay_enabled: False
 
-series: &series kinetic
+series: &series jammy
 
 machines:
   0:
@@ -39,8 +39,6 @@ applications:
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
-    options:
-      source: *openstack-origin
     to:
       - '0'
       - '1'
@@ -49,8 +47,6 @@ applications:
   rabbitmq-server:
     charm: ch:rabbitmq-server
     num_units: 1
-    options:
-      source: *openstack-origin
     to:
       - '3'
     channel: latest/edge
@@ -88,7 +84,7 @@ applications:
       - '10'
   #swift-proxy is used to test gnocchi against an S3 storage backend
   swift-proxy:
-    charm: ch:swift-proxy
+    charm: swift-proxy
     num_units: 1
     options:
       zone-assignment: manual

src/tests/bundles/kinetic-zed.yaml

@@ -1,154 +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':
-  '6':
-  '7':
-  '8':
-  '9':
-  '10':
-  '11':
-  '12':
-  '13':
-    series: focal
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "6"
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  gnocchi-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
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '3'
-    channel: latest/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-    channel: latest/edge
-
-  ceilometer:
-    charm: ch:ceilometer
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-    channel: latest/edge
-
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 3
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      source: *openstack-origin
-    to:
-      - '6'
-      - '7'
-      - '8'
-    channel: latest/edge
-
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      expected-osd-count: 3
-      monitor-count: '3'
-      source: *openstack-origin
-    to:
-      - '9'
-      - '10'
-      - '11'
-    channel: latest/edge
-
-  gnocchi:
-    series: *series
-    charm: ../../../gnocchi_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '12'
-
-  memcached:
-    charm: ch:memcached
-    num_units: 1
-    # Note that holding memcached at focal as it's not available at kinetic yet.
-    series: focal
-    to:
-      - '13'
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-
-  - - 'ceilometer:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'ceilometer:identity-credentials'
-    - 'keystone:identity-credentials'
-
-  - - 'ceilometer:identity-notifications'
-    - 'keystone:identity-notifications'
-
-  - - 'ceilometer:metric-service'
-    - 'gnocchi:metric-service'
-
-  - - 'gnocchi:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'gnocchi:shared-db'
-    - 'gnocchi-mysql-router:shared-db'
-  - - 'gnocchi-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'gnocchi:storage-ceph'
-    - 'ceph-mon:client'
-
-  - - 'gnocchi:coordinator-memcached'
-    - 'memcached:cache'

src/tests/tests.yaml

@@ -8,7 +8,6 @@ smoke_bundles:
 
 dev_bundles:
   - test-s3: jammy-antelope-s3
-  - test-s3: kinetic-zed-s3
   - test-s3: lunar-antelope-s3
 
 configure:
@@ -43,5 +42,4 @@ target_deploy_status:
 
 tests_options:
   force_deploy:
-    - kinetic-zed-s3
     - lunar-antelope-s3