diff --git a/osci.yaml b/osci.yaml index 32a81d4..4b2e8f8 100644 --- a/osci.yaml +++ b/osci.yaml @@ -4,10 +4,7 @@ check: jobs: - test-s3api-jammy-zed - - test-s3api-kinetic-zed: - voting: false - - test-s3api-jammy-antelope: - voting: false + - test-s3api-jammy-antelope - test-s3api-lunar-antelope: voting: false vars: @@ -26,13 +23,6 @@ soft: true vars: tox_extra_args: '-- test-s3api:jammy-zed' -- job: - name: test-s3api-kinetic-zed - parent: func-target - dependencies: - - test-s3api-jammy-zed - vars: - tox_extra_args: '-- test-s3api:kinetic-zed' - job: name: test-s3api-jammy-antelope parent: func-target diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml deleted file mode 100644 index 3405c41..0000000 --- a/tests/bundles/kinetic-zed.yaml +++ /dev/null @@ -1,105 +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: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-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: - expose: True - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - channel: latest/edge - - swift-proxy: - charm: ../../swift-proxy.charm - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '4' - - glance: - expose: True - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - channel: latest/edge - - swift-storage: - charm: ch:swift-storage - num_units: 1 - storage: - block-devices: 'cinder,2G,2' - options: - zone: 1 - openstack-origin: *openstack-origin - to: - - '6' - channel: latest/edge - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'swift-proxy:identity-service' - - 'keystone:identity-service' - - - - 'swift-storage:swift-storage' - - 'swift-proxy:swift-storage' - - - - 'glance:object-store' - - 'swift-proxy:object-store' diff --git a/tests/bundles/overlays/kinetic-zed-gr-r1.yaml.j2 b/tests/bundles/overlays/kinetic-zed-gr-r1.yaml.j2 deleted file mode 100644 index 5e142a9..0000000 --- a/tests/bundles/overlays/kinetic-zed-gr-r1.yaml.j2 +++ /dev/null @@ -1,28 +0,0 @@ -applications: - keystone: - offers: - keystone: - endpoints: - - identity-service - swift-proxy-region1: - charm: {{ charm_location }} - offers: - swift-proxy-region1: - endpoints: - - swift-storage - - rings-distributor - swift-storage-region1-zone1: - offers: - swift-storage-region1-zone1: - endpoints: - - swift-storage - swift-storage-region1-zone2: - offers: - swift-storage-region1-zone2: - endpoints: - - swift-storage - swift-storage-region1-zone3: - offers: - swift-storage-region1-zone3: - endpoints: - - swift-storage diff --git a/tests/bundles/overlays/kinetic-zed-gr-r2.yaml.j2 b/tests/bundles/overlays/kinetic-zed-gr-r2.yaml.j2 deleted file mode 100644 index 689e703..0000000 --- a/tests/bundles/overlays/kinetic-zed-gr-r2.yaml.j2 +++ /dev/null @@ -1,31 +0,0 @@ -applications: - swift-proxy-region2: - charm: {{ charm_location }} -relations: -- - swift-proxy-region2:identity-service - - keystone:identity-service -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone1:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone2:swift-storage -- - swift-proxy-region2:swift-storage - - swift-storage-region1-zone3:swift-storage -- - swift-storage-region2-zone1:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone2:swift-storage - - swift-proxy-region1:swift-storage -- - swift-storage-region2-zone3:swift-storage - - swift-proxy-region1:swift-storage -- - swift-proxy-region2:rings-consumer - - swift-proxy-region1:rings-distributor -saas: - keystone: - url: admin/{{ swift_gr_region1 }}.keystone - swift-proxy-region1: - url: admin/{{ swift_gr_region1 }}.swift-proxy-region1 - swift-storage-region1-zone1: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1 - swift-storage-region1-zone2: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2 - swift-storage-region1-zone3: - url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3 diff --git a/tests/tests.yaml b/tests/tests.yaml index 6629ead..6f0671c 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -5,7 +5,6 @@ gate_bundles: dev_bundles: - test-s3api: jammy-antelope - - test-s3api: kinetic-zed - test-s3api: lunar-antelope smoke_bundles: @@ -29,7 +28,6 @@ tests: tests_options: force_deploy: - - kinetic-zed - lunar-antelope policyd: - service: swift