diff --git a/charmcraft.yaml b/charmcraft.yaml index e422902..781dd8e 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -54,67 +54,3 @@ bases: - name: ubuntu channel: "22.04" architectures: [arm64] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [amd64] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [amd64] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [s390x] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [s390x] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [ppc64el] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [ppc64el] - - build-on: - - name: ubuntu - channel: "23.04" - architectures: [arm64] - run-on: - - name: ubuntu - channel: "23.04" - architectures: [arm64] - - build-on: - - name: ubuntu - channel: "23.10" - architectures: [amd64] - run-on: - - name: ubuntu - channel: "23.10" - architectures: [amd64] - - build-on: - - name: ubuntu - channel: "23.10" - architectures: [s390x] - run-on: - - name: ubuntu - channel: "23.10" - architectures: [s390x] - - build-on: - - name: ubuntu - channel: "23.10" - architectures: [ppc64el] - run-on: - - name: ubuntu - channel: "23.10" - architectures: [ppc64el] - - build-on: - - name: ubuntu - channel: "23.10" - architectures: [arm64] - run-on: - - name: ubuntu - channel: "23.10" - architectures: [arm64] diff --git a/osci.yaml b/osci.yaml index 264697f..27cfcdd 100644 --- a/osci.yaml +++ b/osci.yaml @@ -3,13 +3,11 @@ - charm-unit-jobs-py310 check: jobs: - - jammy-antelope - - jammy-antelope-ovn - jammy-bobcat - jammy-bobcat-ovn - - lunar-antelope: + - jammy-caracal: voting: false - - lunar-antelope-ovn: + - jammy-caracal-ovn: voting: false vars: needs_charm_build: true @@ -18,16 +16,12 @@ charmcraft_channel: 2.x/stable - job: - name: jammy-antelope-ovn + name: jammy-caracal-ovn parent: func-target vars: + juju_snap_channel: '3.1/stable' + pip_constraints_url: 'https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt' tox_extra_args: '-- jammy-antelope-ovn' -- job: - name: lunar-antelope-ovn - parent: func-target - vars: - juju_snap_channel: "3.2/stable" - tox_extra_args: '-- lunar-antelope-ovn' - job: name: jammy-bobcat-ovn parent: func-target diff --git a/src/metadata.yaml b/src/metadata.yaml index 09e2a66..38b0d25 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -5,11 +5,9 @@ description: | Neutron Dynamic Routing Agent acts as a BGP speaker advertising OpenStack networks to the BGP infrastructure. tags: -- openstack + - openstack series: -- jammy -- lunar -- mantic + - jammy subordinate: false extra-bindings: # Used to specify the OpenStack provider network interface diff --git a/src/tests/bundles/jammy-antelope-ovn.yaml b/src/tests/bundles/jammy-antelope-ovn.yaml deleted file mode 100644 index 25eee21..0000000 --- a/src/tests/bundles/jammy-antelope-ovn.yaml +++ /dev/null @@ -1,270 +0,0 @@ -local_overlay_enabled: False - -variables: - openstack-origin: &openstack-origin cloud:jammy-antelope - -series: jammy - -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': - # osci-frr has a limited set of supported series. - series: jammy - '8': - '9': - '10': - '11': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-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 - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - haproxy-server-timeout: 90000 - haproxy-client-timeout: 90000 - haproxy-queue-timeout: 9000 - haproxy-connect-timeout: 9000 - to: - - '3' - channel: latest/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - flat-network-providers: physnet1, - neutron-security-groups: true - openstack-origin: *openstack-origin - haproxy-server-timeout: 90000 - haproxy-client-timeout: 90000 - haproxy-queue-timeout: 9000 - haproxy-connect-timeout: 9000 - to: - - '4' - channel: latest/edge - - neutron-dynamic-routing: - charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '6' - channel: latest/edge - - osci-frr: - charm: ch:osci-frr - series: jammy - num_units: 1 - to: - - '7' - - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: latest/edge - to: - - '8' - - '9' - - '10' - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: latest/edge - options: - enable-distributed-floating-ip: True - - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge - to: - - '11' - - nova-compute: - constraints: mem=7168M - charm: ch:nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - debug: True - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - network-manager: Neutron - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - debug: true - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: latest/edge - - ovn-chassis: - charm: ch:ovn-chassis - channel: latest/edge - options: - ovn-bridge-mappings: physnet1:br-ex - prefer-chassis-as-gw: true - -relations: - - - - 'neutron-dynamic-routing:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-dynamic-routing:bgp-speaker' - - 'osci-frr:bgpclient' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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:identity-service' - - 'keystone:identity-service' - - - - 'nova-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - keystone:identity-service - - glance:identity-service - - - - nova-mysql-router:shared-db - - nova-cloud-controller:shared-db - - - - glance:image-service - - nova-cloud-controller:image-service - - - glance:image-service - - nova-compute:image-service - - - glance-mysql-router:shared-db - - glance:shared-db - - - - keystone:identity-service - - nova-cloud-controller:identity-service - - - - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute - - - - neutron-api:neutron-api - - nova-cloud-controller:neutron-api - - - - rabbitmq-server:amqp - - nova-cloud-controller:amqp - - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - - rabbitmq-server:amqp - - nova-compute:amqp - - - - placement - - placement-mysql-router - - - - placement - - keystone - - - - placement - - nova-cloud-controller - - - - ovn-central:certificates - - vault:certificates - - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - - vault:certificates - - keystone:certificates - - - - vault:certificates - - neutron-api:certificates - - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate - - - - vault:certificates - - glance:certificates - - - - vault:certificates - - nova-cloud-controller:certificates - - - - vault:certificates - - placement:certificates diff --git a/src/tests/bundles/jammy-bobcat-ovn.yaml b/src/tests/bundles/jammy-bobcat-ovn.yaml index da9d295..01703be 100644 --- a/src/tests/bundles/jammy-bobcat-ovn.yaml +++ b/src/tests/bundles/jammy-bobcat-ovn.yaml @@ -64,7 +64,7 @@ applications: haproxy-connect-timeout: 9000 to: - '3' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -79,7 +79,7 @@ applications: haproxy-connect-timeout: 9000 to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-dynamic-routing: charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm @@ -115,7 +115,7 @@ applications: - '10' neutron-api-plugin-ovn: charm: ch:neutron-api-plugin-ovn - channel: latest/edge + channel: 2024.1/edge options: enable-distributed-floating-ip: True @@ -133,7 +133,7 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -142,7 +142,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -151,14 +151,14 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2024.1/edge ovn-chassis: charm: ch:ovn-chassis diff --git a/src/tests/bundles/jammy-bobcat.yaml b/src/tests/bundles/jammy-bobcat.yaml index 1631b14..0c4a21d 100644 --- a/src/tests/bundles/jammy-bobcat.yaml +++ b/src/tests/bundles/jammy-bobcat.yaml @@ -61,7 +61,7 @@ applications: haproxy-connect-timeout: 9000 to: - '3' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -80,7 +80,7 @@ applications: enable-dvr: True to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-dynamic-routing: charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm @@ -118,7 +118,7 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -127,7 +127,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -136,14 +136,14 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch @@ -155,7 +155,7 @@ applications: bridge-mappings: physnet1:br-ex prevent-arp-spoofing: False firewall-driver: openvswitch - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/src/tests/bundles/jammy-antelope.yaml b/src/tests/bundles/jammy-caracal.yaml similarity index 95% rename from src/tests/bundles/jammy-antelope.yaml rename to src/tests/bundles/jammy-caracal.yaml index 1db4cf6..ff1e241 100644 --- a/src/tests/bundles/jammy-antelope.yaml +++ b/src/tests/bundles/jammy-caracal.yaml @@ -1,7 +1,7 @@ local_overlay_enabled: False variables: - openstack-origin: &openstack-origin cloud:jammy-antelope + openstack-origin: &openstack-origin cloud:jammy-caracal series: jammy @@ -61,7 +61,7 @@ applications: haproxy-connect-timeout: 9000 to: - '3' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -80,7 +80,7 @@ applications: enable-dvr: True to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-dynamic-routing: charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm @@ -118,7 +118,7 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -127,7 +127,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -136,14 +136,14 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch @@ -155,7 +155,7 @@ applications: bridge-mappings: physnet1:br-ex prevent-arp-spoofing: False firewall-driver: openvswitch - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/src/tests/bundles/lunar-antelope-ovn.yaml b/src/tests/bundles/lunar-antelope-ovn.yaml deleted file mode 100644 index 5eeb4bf..0000000 --- a/src/tests/bundles/lunar-antelope-ovn.yaml +++ /dev/null @@ -1,270 +0,0 @@ -local_overlay_enabled: False - -variables: - openstack-origin: &openstack-origin distro - -series: lunar - -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': - # osci-frr has a limited set of supported series. - series: jammy - '8': - '9': - '10': - '11': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-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 - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - haproxy-server-timeout: 90000 - haproxy-client-timeout: 90000 - haproxy-queue-timeout: 9000 - haproxy-connect-timeout: 9000 - to: - - '3' - channel: latest/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - flat-network-providers: physnet1, - neutron-security-groups: true - openstack-origin: *openstack-origin - haproxy-server-timeout: 90000 - haproxy-client-timeout: 90000 - haproxy-queue-timeout: 9000 - haproxy-connect-timeout: 9000 - to: - - '4' - channel: latest/edge - - neutron-dynamic-routing: - charm: ../../../neutron-dynamic-routing_ubuntu-23.04-amd64.charm - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '6' - channel: latest/edge - - osci-frr: - charm: ch:osci-frr - series: jammy - num_units: 1 - to: - - '7' - - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: latest/edge - to: - - '8' - - '9' - - '10' - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: latest/edge - options: - enable-distributed-floating-ip: True - - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge - to: - - '11' - - nova-compute: - constraints: mem=7168M - charm: ch:nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - debug: True - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - network-manager: Neutron - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - debug: true - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: latest/edge - - ovn-chassis: - charm: ch:ovn-chassis - channel: latest/edge - options: - ovn-bridge-mappings: physnet1:br-ex - prefer-chassis-as-gw: true - -relations: - - - - 'neutron-dynamic-routing:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-dynamic-routing:bgp-speaker' - - 'osci-frr:bgpclient' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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:identity-service' - - 'keystone:identity-service' - - - - 'nova-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - keystone:identity-service - - glance:identity-service - - - - nova-mysql-router:shared-db - - nova-cloud-controller:shared-db - - - - glance:image-service - - nova-cloud-controller:image-service - - - glance:image-service - - nova-compute:image-service - - - glance-mysql-router:shared-db - - glance:shared-db - - - - keystone:identity-service - - nova-cloud-controller:identity-service - - - - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute - - - - neutron-api:neutron-api - - nova-cloud-controller:neutron-api - - - - rabbitmq-server:amqp - - nova-cloud-controller:amqp - - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - - rabbitmq-server:amqp - - nova-compute:amqp - - - - placement - - placement-mysql-router - - - - placement - - keystone - - - - placement - - nova-cloud-controller - - - - ovn-central:certificates - - vault:certificates - - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - - vault:certificates - - keystone:certificates - - - - vault:certificates - - neutron-api:certificates - - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate - - - - vault:certificates - - glance:certificates - - - - vault:certificates - - nova-cloud-controller:certificates - - - - vault:certificates - - placement:certificates diff --git a/src/tests/bundles/mantic-bobcat-ovn.yaml b/src/tests/bundles/mantic-bobcat-ovn.yaml deleted file mode 100644 index c50f843..0000000 --- a/src/tests/bundles/mantic-bobcat-ovn.yaml +++ /dev/null @@ -1,270 +0,0 @@ -local_overlay_enabled: False - -variables: - openstack-origin: &openstack-origin distro - -series: mantic - -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': - # osci-frr has a limited set of supported series. - series: jammy - '8': - '9': - '10': - '11': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-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 - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - haproxy-server-timeout: 90000 - haproxy-client-timeout: 90000 - haproxy-queue-timeout: 9000 - haproxy-connect-timeout: 9000 - to: - - '3' - channel: latest/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - flat-network-providers: physnet1, - neutron-security-groups: true - openstack-origin: *openstack-origin - haproxy-server-timeout: 90000 - haproxy-client-timeout: 90000 - haproxy-queue-timeout: 9000 - haproxy-connect-timeout: 9000 - to: - - '4' - channel: latest/edge - - neutron-dynamic-routing: - charm: ../../../neutron-dynamic-routing_ubuntu-23.10-amd64.charm - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '6' - channel: latest/edge - - osci-frr: - charm: ch:osci-frr - series: jammy - num_units: 1 - to: - - '7' - - ovn-central: - charm: ch:ovn-central - num_units: 3 - options: - source: *openstack-origin - channel: latest/edge - to: - - '8' - - '9' - - '10' - neutron-api-plugin-ovn: - charm: ch:neutron-api-plugin-ovn - channel: latest/edge - options: - enable-distributed-floating-ip: True - - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge - to: - - '11' - - nova-compute: - constraints: mem=7168M - charm: ch:nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - debug: True - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - network-manager: Neutron - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - debug: true - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: latest/edge - - ovn-chassis: - charm: ch:ovn-chassis - channel: latest/edge - options: - ovn-bridge-mappings: physnet1:br-ex - prefer-chassis-as-gw: true - -relations: - - - - 'neutron-dynamic-routing:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-dynamic-routing:bgp-speaker' - - 'osci-frr:bgpclient' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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:identity-service' - - 'keystone:identity-service' - - - - 'nova-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - keystone:identity-service - - glance:identity-service - - - - nova-mysql-router:shared-db - - nova-cloud-controller:shared-db - - - - glance:image-service - - nova-cloud-controller:image-service - - - glance:image-service - - nova-compute:image-service - - - glance-mysql-router:shared-db - - glance:shared-db - - - - keystone:identity-service - - nova-cloud-controller:identity-service - - - - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute - - - - neutron-api:neutron-api - - nova-cloud-controller:neutron-api - - - - rabbitmq-server:amqp - - nova-cloud-controller:amqp - - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - - rabbitmq-server:amqp - - nova-compute:amqp - - - - placement - - placement-mysql-router - - - - placement - - keystone - - - - placement - - nova-cloud-controller - - - - ovn-central:certificates - - vault:certificates - - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - - vault:certificates - - keystone:certificates - - - - vault:certificates - - neutron-api:certificates - - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate - - - - vault:certificates - - glance:certificates - - - - vault:certificates - - nova-cloud-controller:certificates - - - - vault:certificates - - placement:certificates diff --git a/src/tests/bundles/mantic-bobcat.yaml b/src/tests/bundles/mantic-bobcat.yaml deleted file mode 100644 index 6d8710d..0000000 --- a/src/tests/bundles/mantic-bobcat.yaml +++ /dev/null @@ -1,248 +0,0 @@ -local_overlay_enabled: False - -variables: - openstack-origin: &openstack-origin distro - -series: mantic - -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': - # osci-frr has a limited set of supported series. - series: jammy - '8': - -applications: - - keystone-mysql-router: - charm: ch:mysql-router - channel: latest/edge - neutron-api-mysql-router: - charm: ch:mysql-router - channel: latest/edge - nova-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 - - mysql-innodb-cluster: - charm: ch:mysql-innodb-cluster - num_units: 3 - to: - - '0' - - '1' - - '2' - channel: latest/edge - - keystone: - charm: ch:keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - haproxy-server-timeout: 90000 - haproxy-client-timeout: 90000 - haproxy-queue-timeout: 9000 - haproxy-connect-timeout: 9000 - to: - - '3' - channel: latest/edge - - neutron-api: - charm: ch:neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - flat-network-providers: physnet1 - enable-ml2-port-security: True - neutron-security-groups: True - openstack-origin: *openstack-origin - haproxy-server-timeout: 90000 - haproxy-client-timeout: 90000 - haproxy-queue-timeout: 9000 - haproxy-connect-timeout: 9000 - enable-dvr: True - to: - - '4' - channel: latest/edge - - neutron-dynamic-routing: - charm: ../../../neutron-dynamic-routing_ubuntu-23.10-amd64.charm - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - rabbitmq-server: - charm: ch:rabbitmq-server - num_units: 1 - to: - - '6' - channel: latest/edge - - osci-frr: - charm: ch:osci-frr - series: jammy - num_units: 1 - to: - - '7' - - vault: - charm: ch:vault - num_units: 1 - channel: latest/edge - to: - - '8' - - nova-compute: - constraints: mem=7168M - charm: ch:nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - debug: True - channel: latest/edge - - nova-cloud-controller: - charm: ch:nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: True - network-manager: Neutron - channel: latest/edge - - placement: - charm: ch:placement - num_units: 1 - constraints: mem=1G - options: - openstack-origin: *openstack-origin - debug: true - channel: latest/edge - - glance: - charm: ch:glance - num_units: 1 - options: - openstack-origin: *openstack-origin - channel: latest/edge - - neutron-openvswitch: - charm: ch:neutron-openvswitch - num_units: 0 - options: - debug: True - enable-local-dhcp-and-metadata: True - use-dvr-snat: True - bridge-mappings: physnet1:br-ex - prevent-arp-spoofing: False - firewall-driver: openvswitch - channel: latest/edge - -relations: - - - - 'neutron-dynamic-routing:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-dynamic-routing:bgp-speaker' - - 'osci-frr:bgpclient' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - '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:identity-service' - - 'keystone:identity-service' - - - - 'nova-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - keystone:identity-service - - glance:identity-service - - - - nova-mysql-router:shared-db - - nova-cloud-controller:shared-db - - - - glance:image-service - - nova-cloud-controller:image-service - - - glance:image-service - - nova-compute:image-service - - - glance-mysql-router:shared-db - - glance:shared-db - - - - keystone:identity-service - - nova-cloud-controller:identity-service - - - - nova-compute:cloud-compute - - nova-cloud-controller:cloud-compute - - - - neutron-api:neutron-api - - nova-cloud-controller:neutron-api - - - - rabbitmq-server:amqp - - nova-cloud-controller:amqp - - - - rabbitmq-server:amqp - - nova-compute:amqp - - - - placement - - placement-mysql-router - - - - placement - - keystone - - - - placement - - nova-cloud-controller - - - - vault:certificates - - keystone:certificates - - - - vault:certificates - - neutron-api:certificates - - - - vault:certificates - - glance:certificates - - - - vault:certificates - - nova-cloud-controller:certificates - - - - vault:certificates - - placement:certificates - - - - rabbitmq-server:amqp - - neutron-openvswitch:amqp - - - neutron-api:neutron-plugin-api - - neutron-openvswitch:neutron-plugin-api - - - neutron-openvswitch:neutron-plugin - - nova-compute:neutron-plugin diff --git a/src/tests/bundles/lunar-antelope.yaml b/src/tests/bundles/noble-caracal.yaml similarity index 95% rename from src/tests/bundles/lunar-antelope.yaml rename to src/tests/bundles/noble-caracal.yaml index 306e897..839a61e 100644 --- a/src/tests/bundles/lunar-antelope.yaml +++ b/src/tests/bundles/noble-caracal.yaml @@ -3,7 +3,7 @@ local_overlay_enabled: False variables: openstack-origin: &openstack-origin distro -series: lunar +series: noble comment: - 'machines section to decide order of deployment. database sooner = faster' @@ -61,7 +61,7 @@ applications: haproxy-connect-timeout: 9000 to: - '3' - channel: latest/edge + channel: 2024.1/edge neutron-api: charm: ch:neutron-api @@ -80,10 +80,10 @@ applications: enable-dvr: True to: - '4' - channel: latest/edge + channel: 2024.1/edge neutron-dynamic-routing: - charm: ../../../neutron-dynamic-routing_ubuntu-23.04-amd64.charm + charm: ../../../neutron-dynamic-routing_ubuntu-22.04-amd64.charm num_units: 1 options: openstack-origin: *openstack-origin @@ -118,7 +118,7 @@ applications: options: openstack-origin: *openstack-origin debug: True - channel: latest/edge + channel: 2024.1/edge nova-cloud-controller: charm: ch:nova-cloud-controller @@ -127,7 +127,7 @@ applications: openstack-origin: *openstack-origin debug: True network-manager: Neutron - channel: latest/edge + channel: 2024.1/edge placement: charm: ch:placement @@ -136,14 +136,14 @@ applications: options: openstack-origin: *openstack-origin debug: true - channel: latest/edge + channel: 2024.1/edge glance: charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin - channel: latest/edge + channel: 2024.1/edge neutron-openvswitch: charm: ch:neutron-openvswitch @@ -155,7 +155,7 @@ applications: bridge-mappings: physnet1:br-ex prevent-arp-spoofing: False firewall-driver: openvswitch - channel: latest/edge + channel: 2024.1/edge relations: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 889c616..511763b 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,29 +1,20 @@ charm_name: neutron-dynamic-routing configure: -- zaza.openstack.charm_tests.vault.setup.auto_initialize -- zaza.openstack.charm_tests.glance.setup.add_lts_image -- zaza.openstack.charm_tests.nova.setup.create_flavors -- zaza.openstack.charm_tests.nova.setup.manage_ssh_key -- zaza.openstack.charm_tests.dragent.configure.setup + - zaza.openstack.charm_tests.vault.setup.auto_initialize + - zaza.openstack.charm_tests.glance.setup.add_lts_image + - zaza.openstack.charm_tests.nova.setup.create_flavors + - zaza.openstack.charm_tests.nova.setup.manage_ssh_key + - zaza.openstack.charm_tests.dragent.configure.setup gate_bundles: -- jammy-antelope -- jammy-antelope-ovn - + - jammy-antelope + - jammy-bobcat + - jammy-caracal smoke_bundles: -- jammy-antelope-ovn - + - jammy-caracal dev_bundles: -- jammy-antelope -- jammy-antelope-ovn -- jammy-bobcat -- jammy-bobcat-ovn -- lunar-antelope -- lunar-antelope-ovn -- mantic-bobcat -- mantic-bobcat-ovn - + - noble-caracal target_deploy_status: neutron-api-plugin-ovn: workload-status: waiting @@ -40,8 +31,8 @@ target_deploy_status: tests: -- zaza.openstack.charm_tests.dragent.tests.DRAgentTest + - zaza.openstack.charm_tests.dragent.tests.DRAgentTest tests_options: force_deploy: - - lunar-antelope + - noble-caracal diff --git a/src/tox.ini b/src/tox.ini index 8ffff0f..2ddcccd 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -25,7 +25,9 @@ passenv = CS_* OS_* TEST_* -deps = -r{toxinidir}/test-requirements.txt +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/test-requirements.txt [testenv:pep8] basepython = python3 diff --git a/tox.ini b/tox.ini index c2be05e..50ddef3 100644 --- a/tox.ini +++ b/tox.ini @@ -49,12 +49,16 @@ commands = [testenv:py3] basepython = python3 -deps = -r{toxinidir}/test-requirements.txt +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} [testenv:py310] basepython = python3.10 -deps = -r{toxinidir}/test-requirements.txt +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} [testenv:pep8] @@ -67,7 +71,9 @@ commands = flake8 {posargs} src unit_tests # Technique based heavily upon # https://github.com/openstack/nova/blob/master/tox.ini basepython = python3 -deps = -r{toxinidir}/requirements.txt +deps = + -c {env:TEST_CONSTRAINTS_FILE:https://raw.githubusercontent.com/openstack-charmers/zaza-openstack-tests/master/constraints/constraints-2024.1.txt} + -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt setenv = {[testenv]setenv}