From 82b425c9dd457df3e2bf45024a8a4c96c6f68ff6 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Wed, 29 Mar 2023 21:01:49 +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 * Add libpython3-dev to allow the charm to be built. This fixes a missing dependency with Cython Change-Id: Id8e23d885d2bed9a7ace4b6e71fad890fce5b425 --- charmcraft.yaml | 2 + src/tests/bundles/kinetic-zed.yaml | 344 ----------------------------- src/tests/tests.yaml | 2 - 3 files changed, 2 insertions(+), 346 deletions(-) delete mode 100644 src/tests/bundles/kinetic-zed.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml index e34793a..00d4019 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -4,6 +4,8 @@ parts: charm: source: src/ plugin: reactive + build-packages: + - libpython3-dev build-snaps: - charm build-environment: diff --git a/src/tests/bundles/kinetic-zed.yaml b/src/tests/bundles/kinetic-zed.yaml deleted file mode 100644 index 02bdc58..0000000 --- a/src/tests/bundles/kinetic-zed.yaml +++ /dev/null @@ -1,344 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -local_overlay_enabled: False - -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': - '8': - '9': - # the following machines are for nova-compute which needs more memory - # for the instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - '13': - '14': - '15': - '16': - '17': - -applications: - - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - magnum-mysql-router: - charm: ch:mysql-router - channel: latest/edge - heat-mysql-router: - charm: ch:mysql-router - channel: latest/edge - barbican-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 - to: - - '3' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '4' - channel: latest/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - channel: latest/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - channel: latest/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - channel: latest/edge - - nova-compute: - charm: ch:nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - to: - - '10' - - '11' - channel: latest/edge - - vault: - charm: ch:vault - num_units: 1 - to: - - '12' - channel: latest/edge - - magnum: - charm: ../../../magnum.charm - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '13' - - '14' - - '15' - - magnum-hacluster: - charm: ch:hacluster - num_units: 0 - options: - corosync_transport: unicast - cluster_count: 3 - channel: latest/edge - - heat: - charm: ch:heat - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '16' - channel: latest/edge - - barbican: - charm: ch:barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - channel: latest/edge - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-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' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' - - - - 'magnum:shared-db' - - 'magnum-mysql-router:shared-db' - - - 'magnum-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'magnum:amqp' - - 'rabbitmq-server:amqp' - - - - 'magnum:identity-service' - - 'keystone:identity-service' - - - - 'magnum:certificates' - - 'vault:certificates' - - - - 'magnum:ha' - - 'magnum-hacluster:ha' - - - - 'heat:amqp' - - 'rabbitmq-server:amqp' - - - - 'heat:identity-service' - - 'keystone:identity-service' - - - - 'heat:shared-db' - - 'heat-mysql-router:shared-db' - - - 'heat-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'heat:certificates' - - 'vault:certificates' - - - - 'barbican:amqp' - - 'rabbitmq-server:amqp' - - - - 'barbican:identity-service' - - 'keystone:identity-service' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:certificates' - - 'vault:certificates' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 6f72e7d..3ce4bcc 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 configure: @@ -37,5 +36,4 @@ target_deploy_status: tests_options: force_deploy: - - kinetic-zed - lunar-antelope