Remove kinetic support

Change-Id: I92d02b1385dec1a047ed67d162ef860ccb15b061

metadata.yaml

@@ -13,7 +13,6 @@ tags:
 series:
 - focal
 - jammy
-- kinetic
 - lunar
 subordinate: false
 min-juju-version: 2.7.6

osci.yaml

@@ -7,10 +7,6 @@
       - ceph-iscsi-focal-quincy-ec
       - ceph-iscsi-jammy-quincy
       - ceph-iscsi-jammy-quincy-ec
-      - ceph-iscsi-kinetic-quincy:
-          voting: false
-      - ceph-iscsi-kinetic-quincy-ec:
-          voting: false
       - ceph-iscsi-lunar-quincy:
           voting: false
       - ceph-iscsi-lunar-quincy-ec:
@@ -52,20 +48,6 @@
       - ceph-iscsi-jammy-quincy
     vars:
       tox_extra_args: -- jammy-ec
-- job:
-    name: ceph-iscsi-kinetic-quincy
-    parent: func-target
-    dependencies:
-      - ceph-iscsi-jammy-quincy
-    vars:
-      tox_extra_args: -- kinetic
-- job:
-    name: ceph-iscsi-kinetic-quincy-ec
-    parent: func-target
-    dependencies:
-      - ceph-iscsi-jammy-quincy
-    vars:
-      tox_extra_args: -- kinetic-ec
 
 - job:
     name: ceph-iscsi-lunar-quincy

tests/bundles/jammy-ec.yaml

@@ -69,7 +69,7 @@ applications:
     charm: ch:vault
     to:
       - '6'
-    channel: latest/edge
+    channel: 1.8/stable
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
@@ -77,10 +77,11 @@ applications:
       - '8'
       - '9'
       - '10'
-    channel: latest/edge
+    channel: 8.0/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
+
 relations:
   - - 'ceph-mon:client'
     - 'ceph-iscsi:ceph-client'

tests/bundles/jammy.yaml

@@ -70,7 +70,7 @@ applications:
     charm: ch:vault
     to:
       - '6'
-    channel: latest/edge
+    channel: 1.8/stable
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
     num_units: 3
@@ -78,10 +78,11 @@ applications:
       - '8'
       - '9'
       - '10'
-    channel: latest/edge
+    channel: 8.0/edge
   vault-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
+
 relations:
   - - 'ceph-mon:client'
     - 'ceph-iscsi:ceph-client'

tests/bundles/kinetic-ec.yaml

@@ -1,94 +0,0 @@
-local_overlay_enabled: False
-series: kinetic
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-    constraints: mem=3072M
-  '9':
-    constraints: mem=3072M
-  '10':
-    constraints: mem=3072M
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-applications:
-  ubuntu:
-    charm: cs:ubuntu
-    num_units: 3
-    to:
-      - '7'
-      - '14'
-      - '15'
-  ceph-iscsi:
-    charm: ../../ceph-iscsi.charm
-    num_units: 2
-    options:
-      gateway-metadata-pool: iscsi-foo-metadata
-      pool-type: erasure-coded
-      ec-profile-k: 4
-      ec-profile-m: 2
-    to:
-      - '0'
-      - '1'
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '0'
-      - '1'
-      - '2'
-      - '11'
-      - '12'
-      - '13'
-    channel: latest/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: latest/edge
-  vault:
-    num_units: 1
-    charm: ch:vault
-    to:
-      - '6'
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    to:
-      - '8'
-      - '9'
-      - '10'
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-relations:
-  - - 'ceph-mon:client'
-    - 'ceph-iscsi:ceph-client'
-  - - 'vault:certificates'
-    - 'ceph-iscsi:certificates'
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

tests/bundles/kinetic.yaml

@@ -1,95 +0,0 @@
-local_overlay_enabled: False
-series: kinetic
-machines:
-  '0':
-  '1':
-  '2':
-  '3':
-  '4':
-  '5':
-  '6':
-  '7':
-  '8':
-    constraints: mem=3072M
-  '9':
-    constraints: mem=3072M
-  '10':
-    constraints: mem=3072M
-  '11':
-  '12':
-  '13':
-  '14':
-  '15':
-  '16':
-  '17':
-applications:
-  ubuntu:
-    charm: cs:ubuntu
-    num_units: 3
-    to:
-      - '7'
-      - '14'
-      - '15'
-  ceph-iscsi:
-    charm: ../../ceph-iscsi.charm
-    num_units: 4
-    options:
-      gateway-metadata-pool: iscsi-foo-metadata
-    to:
-      - '0'
-      - '1'
-      - '16'
-      - '17'
-  ceph-osd:
-    charm: ch:ceph-osd
-    num_units: 6
-    storage:
-      osd-devices: 'cinder,10G'
-    options:
-      osd-devices: '/dev/test-non-existent'
-    to:
-      - '0'
-      - '1'
-      - '2'
-      - '11'
-      - '12'
-      - '13'
-    channel: latest/edge
-  ceph-mon:
-    charm: ch:ceph-mon
-    num_units: 3
-    options:
-      monitor-count: '3'
-    to:
-      - '3'
-      - '4'
-      - '5'
-    channel: latest/edge
-  vault:
-    num_units: 1
-    charm: ch:vault
-    to:
-      - '6'
-    channel: latest/edge
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    to:
-      - '8'
-      - '9'
-      - '10'
-    channel: latest/edge
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-relations:
-  - - 'ceph-mon:client'
-    - 'ceph-iscsi:ceph-client'
-  - - 'vault:certificates'
-    - 'ceph-iscsi:certificates'
-  - - 'ceph-osd:mon'
-    - 'ceph-mon:osd'
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'

tests/tests.yaml

@@ -9,8 +9,6 @@ smoke_bundles:
 dev_bundles:
   - jammy-ec
   - jammy
-  - kinetic-ec
-  - kinetic
 configure:
   - zaza.openstack.charm_tests.vault.setup.auto_initialize_no_validation
   - zaza.openstack.charm_tests.ceph.iscsi.setup.basic_guest_setup