From 4566d5b8a07d0397fcf8ede4f09308cfc74bbcf7 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 Change-Id: Ie2cd5ecefbf43df0a0626827ad6fe4ca179bc60d --- tests/bundles/kinetic-zed.yaml | 373 ------------------ ...my-yoga.yaml.j2 => jammy-antelope.yaml.j2} | 0 ...tic-zed.yaml.j2 => lunar-antelope.yaml.j2} | 0 tests/tests.yaml | 2 - 4 files changed, 375 deletions(-) delete mode 100644 tests/bundles/kinetic-zed.yaml rename tests/bundles/overlays/{jammy-yoga.yaml.j2 => jammy-antelope.yaml.j2} (100%) rename tests/bundles/overlays/{kinetic-zed.yaml.j2 => lunar-antelope.yaml.j2} (100%) diff --git a/tests/bundles/kinetic-zed.yaml b/tests/bundles/kinetic-zed.yaml deleted file mode 100644 index eda3a3e..0000000 --- a/tests/bundles/kinetic-zed.yaml +++ /dev/null @@ -1,373 +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': - # machines 10 and 11 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': - '18': - '19': - series: jammy - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - glance-mysql-router: - charm: ch:mysql-router - channel: latest/edge - openstack-dashboard-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-cloud-controller-mysql-router: - charm: ch:mysql-router - channel: latest/edge - cinder-mysql-router: - charm: ch:mysql-router - channel: latest/edge - vault-mysql-router: - charm: ch:mysql-router - channel: latest/edge - placement-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 - - cinder: - num_units: 1 - charm: ch:cinder - options: - openstack-origin: *openstack-origin - glance-api-version: 2 - block-device: None - to: - - '3' - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 3 - options: - openstack-origin: *openstack-origin - token-provider: 'fernet' - to: - - '5' - - '6' - - '7' - channel: latest/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - openstack-origin: *openstack-origin - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '8' - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - network-manager: Neutron - to: - - '9' - channel: latest/edge - - nova-compute: - charm: ch:nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - to: - - '10' - - '11' - channel: latest/edge - - ntp: - charm: ch:ntp - num_units: 0 - - openstack-dashboard: - charm: ch:openstack-dashboard - num_units: 3 - options: - openstack-origin: *openstack-origin - to: - - '12' - - '13' - - '14' - channel: latest/edge - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '15' - channel: latest/edge - - vault: - num_units: 1 - charm: ch:vault - to: - - '16' - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '17' - channel: latest/edge - - keystone-openidc: - charm: ../../keystone-openidc.charm - num_units: 0 - - keystone-hacluster: - charm: ch:hacluster - num_units: 0 - options: - corosync_transport: unicast - cluster_count: 3 - channel: latest/edge - - openstack-dashboard-hacluster: - charm: ch:hacluster - num_units: 0 - options: - corosync_transport: unicast - cluster_count: 3 - channel: latest/edge - - neutron-gateway: - charm: ch:neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '18' - channel: latest/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - channel: latest/edge - - openidc-test-fixture: - charm: ch:openidc-test-fixture - num_units: 1 - series: jammy - channel: latest/edge - to: - - '19' - -relations: - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - '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' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'openstack-dashboard:identity-service' - - 'keystone:identity-service' - - - - 'openstack-dashboard:shared-db' - - 'openstack-dashboard-mysql-router:shared-db' - - - 'openstack-dashboard-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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:neutron-api' - - 'neutron-api:neutron-api' - - - - 'cinder:image-service' - - 'glance:image-service' - - - - 'cinder:amqp' - - 'rabbitmq-server:amqp' - - - - 'cinder:identity-service' - - 'keystone:identity-service' - - - - 'cinder:cinder-volume-service' - - 'nova-cloud-controller:cinder-volume-service' - - - - 'cinder:shared-db' - - 'cinder-mysql-router:shared-db' - - - 'cinder-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'ntp:juju-info' - - 'nova-compute:juju-info' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'openstack-dashboard:certificates' - - - - 'keystone:websso-trusted-dashboard' - - 'openstack-dashboard:websso-trusted-dashboard' - - - - 'vault:certificates' - - 'cinder:certificates' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'vault:certificates' - - 'placement:certificates' - - - - "placement:shared-db" - - "placement-mysql-router:shared-db" - - - "placement-mysql-router:db-router" - - "mysql-innodb-cluster:db-router" - - - - "keystone:ha" - - "keystone-hacluster:ha" - - - "openstack-dashboard:ha" - - "openstack-dashboard-hacluster:ha" - - - - 'keystone-openidc:keystone-fid-service-provider' - - 'keystone:keystone-fid-service-provider' - - - - 'keystone-openidc:websso-fid-service-provider' - - 'openstack-dashboard:websso-fid-service-provider' - - - - 'vault:certificates' - - 'openidc-test-fixture:certificates' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' diff --git a/tests/bundles/overlays/jammy-yoga.yaml.j2 b/tests/bundles/overlays/jammy-antelope.yaml.j2 similarity index 100% rename from tests/bundles/overlays/jammy-yoga.yaml.j2 rename to tests/bundles/overlays/jammy-antelope.yaml.j2 diff --git a/tests/bundles/overlays/kinetic-zed.yaml.j2 b/tests/bundles/overlays/lunar-antelope.yaml.j2 similarity index 100% rename from tests/bundles/overlays/kinetic-zed.yaml.j2 rename to tests/bundles/overlays/lunar-antelope.yaml.j2 diff --git a/tests/tests.yaml b/tests/tests.yaml index ae42cd8..9ac2394 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -8,7 +8,6 @@ gate_bundles: dev_bundles: - jammy-antelope -- kinetic-zed - lunar-antelope configure: @@ -41,5 +40,4 @@ target_deploy_status: workload-status-message-prefix: 'chrony: Ready' tests_options: force_deploy: - - kinetic-zed - lunar-antelope