From a147b4459e1b83b86e0b167a364d5dd69b484af6 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Tue, 14 Feb 2023 21:26:02 +0000 Subject: [PATCH] Add Antelope support * sync charm-helpers to classic charms * change openstack-origin/source default to antelope * align testing with antelope * add new antelope bundles * add antelope bundles to tests.yaml * add antelope tests to osci.yaml and .zuul.yaml * update build-on and run-on bases Change-Id: Ie29529f16ae522c42c5f11441be7526d28042bb4 --- .zuul.yaml | 2 +- charmcraft.yaml | 12 + osci.yaml | 68 +++-- src/metadata.yaml | 1 + ...ha-ovn.yaml => jammy-antelope-ha-ovn.yaml} | 6 +- src/tests/bundles/jammy-antelope-ha.yaml | 232 +++++++++++++++++ src/tests/bundles/jammy-zed-ha-ovn.yaml | 8 +- src/tests/bundles/jammy-zed-ha.yaml | 2 +- src/tests/bundles/kinetic-zed-ha-ovn.yaml | 10 +- src/tests/bundles/kinetic-zed-ha.yaml | 4 +- src/tests/bundles/lunar-antelope-ha-ovn.yaml | 237 ++++++++++++++++++ ...my-yoga-ha.yaml => lunar-antelope-ha.yaml} | 6 +- src/tests/tests.yaml | 20 +- 13 files changed, 554 insertions(+), 54 deletions(-) rename src/tests/bundles/{jammy-yoga-ha-ovn.yaml => jammy-antelope-ha-ovn.yaml} (98%) create mode 100644 src/tests/bundles/jammy-antelope-ha.yaml create mode 100644 src/tests/bundles/lunar-antelope-ha-ovn.yaml rename src/tests/bundles/{jammy-yoga-ha.yaml => lunar-antelope-ha.yaml} (98%) diff --git a/.zuul.yaml b/.zuul.yaml index 23bf5f62..fd20909e 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,4 +1,4 @@ - project: templates: - - openstack-python3-charm-zed-jobs + - openstack-python3-charm-jobs - openstack-cover-jobs diff --git a/charmcraft.yaml b/charmcraft.yaml index 5a06ff27..d06a6c7c 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -33,6 +33,9 @@ bases: - name: ubuntu channel: "22.10" architectures: [amd64] + - name: ubuntu + channel: "23.04" + architectures: [amd64] - build-on: - name: ubuntu channel: "22.04" @@ -44,6 +47,9 @@ bases: - name: ubuntu channel: "22.10" architectures: [arm64] + - name: ubuntu + channel: "23.04" + architectures: [arm64] - build-on: - name: ubuntu channel: "22.04" @@ -55,6 +61,9 @@ bases: - name: ubuntu channel: "22.10" architectures: [ppc64el] + - name: ubuntu + channel: "23.04" + architectures: [ppc64el] - build-on: - name: ubuntu channel: "22.04" @@ -66,3 +75,6 @@ bases: - name: ubuntu channel: "22.10" architectures: [s390x] + - name: ubuntu + channel: "23.04" + architectures: [s390x] diff --git a/osci.yaml b/osci.yaml index f4e9808f..a76333d0 100644 --- a/osci.yaml +++ b/osci.yaml @@ -3,15 +3,19 @@ - charm-unit-jobs-py310 check: jobs: - - jammy-yoga-ha - - jammy-yoga-ha-ovn - - jammy-zed-ha: - voting: false - - jammy-zed-ha-ovn: - voting: false + - jammy-zed-ha + - jammy-zed-ha-ovn - kinetic-zed-ha: voting: false - - kinetic-zed: + - kinetic-zed-ha-ovn: + voting: false + - jammy-antelope-ha: + voting: false + - jammy-antelope-ha-ovn: + voting: false + - lunar-antelope-ha: + voting: false + - lunar-antelope-ha-ovn: voting: false vars: needs_charm_build: true @@ -20,47 +24,61 @@ charmcraft_channel: 2.1/stable - job: - name: jammy-yoga-ha + name: jammy-zed-ha parent: func-target dependencies: - osci-lint - name: tox-py310 soft: true - charm-build - vars: - tox_extra_args: '-- jammy-yoga-ha' -- job: - name: jammy-yoga-ha-ovn - parent: func-target - dependencies: - - jammy-yoga-ha - vars: - tox_extra_args: '-- jammy-yoga-ha-ovn' -- job: - name: jammy-zed-ha - parent: func-target - dependencies: - - jammy-yoga-ha vars: tox_extra_args: '-- jammy-zed-ha' - job: name: jammy-zed-ha-ovn parent: func-target dependencies: - - jammy-yoga-ha + - jammy-zed-ha vars: tox_extra_args: '-- jammy-zed-ha-ovn' - job: name: kinetic-zed-ha parent: func-target dependencies: - - jammy-yoga-ha + - jammy-zed-ha vars: tox_extra_args: '-- kinetic-zed-ha' - job: name: kinetic-zed-ha-ovn parent: func-target dependencies: - - jammy-yoga-ha + - jammy-zed-ha vars: tox_extra_args: '-- kinetic-zed-ha-ovn' +- job: + name: jammy-antelope-ha + parent: func-target + dependencies: + - jammy-zed-ha + vars: + tox_extra_args: '-- jammy-antelope-ha' +- job: + name: jammy-antelope-ha-ovn + parent: func-target + dependencies: + - jammy-zed-ha + vars: + tox_extra_args: '-- jammy-antelope-ha-ovn' +- job: + name: lunar-antelope-ha + parent: func-target + dependencies: + - jammy-zed-ha + vars: + tox_extra_args: '-- lunar-antelope-ha' +- job: + name: lunar-antelope-ha-ovn + parent: func-target + dependencies: + - jammy-zed-ha + vars: + tox_extra_args: '-- lunar-antelope-ha-ovn' diff --git a/src/metadata.yaml b/src/metadata.yaml index 002ca987..81ef2cba 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -20,6 +20,7 @@ tags: series: - jammy - kinetic +- lunar subordinate: false provides: nrpe-external-master: diff --git a/src/tests/bundles/jammy-yoga-ha-ovn.yaml b/src/tests/bundles/jammy-antelope-ha-ovn.yaml similarity index 98% rename from src/tests/bundles/jammy-yoga-ha-ovn.yaml rename to src/tests/bundles/jammy-antelope-ha-ovn.yaml index e4b4bd6e..ac763870 100644 --- a/src/tests/bundles/jammy-yoga-ha-ovn.yaml +++ b/src/tests/bundles/jammy-antelope-ha-ovn.yaml @@ -1,5 +1,5 @@ variables: - openstack-origin: &openstack-origin distro + openstack-origin: &openstack-origin cloud:jammy-antelope local_overlay_enabled: True @@ -177,7 +177,7 @@ applications: octavia: constraints: cores=8 series: *series - charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 3 options: openstack-origin: *openstack-origin @@ -204,8 +204,8 @@ applications: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' - retrofit-uca-pocket: yoga retrofit-series: *series + retrofit-uca-pocket: antelope channel: latest/edge placement: charm: ch:placement diff --git a/src/tests/bundles/jammy-antelope-ha.yaml b/src/tests/bundles/jammy-antelope-ha.yaml new file mode 100644 index 00000000..0eb6bb18 --- /dev/null +++ b/src/tests/bundles/jammy-antelope-ha.yaml @@ -0,0 +1,232 @@ +variables: + openstack-origin: &openstack-origin cloud:jammy-antelope + +local_overlay_enabled: True + +series: &series jammy +relations: +- - glance:image-service + - nova-cloud-controller:image-service +- - glance:image-service + - nova-compute:image-service +- - glance-mysql-router:shared-db + - glance:shared-db +- - keystone-mysql-router:shared-db + - keystone:shared-db +- - neutron-mysql-router:shared-db + - neutron-api:shared-db +- - nova-mysql-router:shared-db + - nova-cloud-controller:shared-db +- - octavia-mysql-router:shared-db + - octavia:shared-db +- - keystone:identity-service + - glance:identity-service +- - keystone:identity-service + - nova-cloud-controller:identity-service +- - keystone:identity-service + - neutron-api:identity-service +- - keystone:identity-service + - octavia:identity-service +- - nova-compute:cloud-compute + - nova-cloud-controller:cloud-compute +- - rabbitmq-server:amqp + - neutron-api:amqp +- - rabbitmq-server:amqp + - glance:amqp +- - rabbitmq-server:amqp + - nova-cloud-controller:amqp +- - rabbitmq-server:amqp + - nova-compute:amqp +- - rabbitmq-server:amqp + - octavia:amqp +- - neutron-api:neutron-api + - nova-cloud-controller:neutron-api +- - neutron-api:neutron-load-balancer + - octavia:neutron-api +- - rabbitmq-server:amqp + - neutron-openvswitch:amqp +- - neutron-api:neutron-plugin-api + - neutron-openvswitch:neutron-plugin-api +- - neutron-openvswitch:neutron-plugin + - nova-compute:neutron-plugin +- - rabbitmq-server:amqp + - neutron-openvswitch-octavia:amqp +- - neutron-api:neutron-plugin-api + - neutron-openvswitch-octavia:neutron-plugin-api +- - neutron-openvswitch-octavia:neutron-plugin + - octavia:neutron-openvswitch +- - hacluster-octavia:ha + - octavia:ha +- - glance-simplestreams-sync:juju-info + - octavia-diskimage-retrofit:juju-info +- - keystone:identity-service + - glance-simplestreams-sync:identity-service +- - keystone:identity-credentials + - octavia-diskimage-retrofit:identity-credentials +- [ placement, placement-mysql-router ] +- [ placement, keystone ] +- [ placement, nova-cloud-controller ] +- - vault:shared-db + - vault-mysql-router:shared-db +- - vault:certificates + - glance:certificates +- - vault:certificates + - keystone:certificates +- - vault:certificates + - neutron-api:certificates +- - vault:certificates + - nova-cloud-controller:certificates +- - vault:certificates + - octavia:certificates +- - vault:certificates + - octavia-diskimage-retrofit:certificates +- - vault:certificates + - glance-simplestreams-sync:certificates +- - vault:certificates + - placement:certificates +- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +applications: + glance: + charm: ch:glance + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: latest/edge + keystone: + charm: ch:keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: latest/edge + octavia-mysql-router: + charm: ch:mysql-router + channel: latest/edge + keystone-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 + neutron-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 + mysql-innodb-cluster: + constraints: mem=3072M + charm: ch:mysql-innodb-cluster + num_units: 3 + channel: latest/edge + neutron-api: + charm: ch:neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + flat-network-providers: physnet1 + enable-ml2-port-security: True + neutron-security-groups: True + enable-dvr: True + manage-neutron-plugin-legacy-mode: True + channel: latest/edge + neutron-openvswitch: + series: *series + charm: ch:neutron-openvswitch + num_units: 0 + options: + debug: True + enable-local-dhcp-and-metadata: True + use-dvr-snat: True + prevent-arp-spoofing: False + firewall-driver: openvswitch + bridge-mappings: physnet1:br-ex + channel: latest/edge + neutron-openvswitch-octavia: + series: *series + charm: ch:neutron-openvswitch + num_units: 0 + options: + debug: True + prevent-arp-spoofing: False + firewall-driver: openvswitch + channel: latest/edge + nova-cloud-controller: + constraints: mem=7168M + charm: ch:nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + network-manager: Neutron + channel: latest/edge + nova-compute: + constraints: mem=7168M + charm: ch:nova-compute + num_units: 2 + options: + openstack-origin: *openstack-origin + debug: True + channel: latest/edge + hacluster-octavia: + charm: ch:hacluster + num_units: 0 + channel: latest/edge + octavia: + constraints: cores=8 + series: *series + charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + num_units: 3 + options: + openstack-origin: *openstack-origin + debug: True + loadbalancer-topology: 'ACTIVE_STANDBY' + vip: 'ADD YOUR VIP HERE' + rabbitmq-server: + charm: ch:rabbitmq-server + num_units: 1 + channel: latest/edge + glance-simplestreams-sync: + charm: ch:glance-simplestreams-sync + num_units: 1 + options: + use_swift: False + mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/', + name_prefix: 'ubuntu:released', + path: 'streams/v1/index.sjson', max: 1, + item_filters: [ + 'release~(jammy)', + 'arch~(x86_64|amd64)', + 'ftype~(disk1.img|disk.img)']}]" + channel: latest/edge + octavia-diskimage-retrofit: + charm: ch:octavia-diskimage-retrofit + options: + amp-image-tag: 'octavia-amphora' + retrofit-series: *series + retrofit-uca-pocket: antelope + channel: latest/edge + placement: + charm: ch:placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + debug: true + channel: latest/edge + vault: + charm: ch:vault + num_units: 1 + channel: latest/edge diff --git a/src/tests/bundles/jammy-zed-ha-ovn.yaml b/src/tests/bundles/jammy-zed-ha-ovn.yaml index 2f776971..6fc2f330 100644 --- a/src/tests/bundles/jammy-zed-ha-ovn.yaml +++ b/src/tests/bundles/jammy-zed-ha-ovn.yaml @@ -173,11 +173,11 @@ applications: ovn-chassis-octavia: series: *series charm: ch:ovn-chassis - channel: 22.03/edge + channel: latest/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 3 options: openstack-origin: *openstack-origin @@ -224,10 +224,10 @@ applications: num_units: 3 options: source: *openstack-origin - channel: 22.03/edge + channel: latest/edge ovn-chassis: charm: ch:ovn-chassis - channel: 22.03/edge + channel: latest/edge vault: charm: ch:vault num_units: 1 diff --git a/src/tests/bundles/jammy-zed-ha.yaml b/src/tests/bundles/jammy-zed-ha.yaml index 5aa83d5a..78e55669 100644 --- a/src/tests/bundles/jammy-zed-ha.yaml +++ b/src/tests/bundles/jammy-zed-ha.yaml @@ -187,7 +187,7 @@ applications: octavia: constraints: cores=8 series: *series - charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 3 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/kinetic-zed-ha-ovn.yaml b/src/tests/bundles/kinetic-zed-ha-ovn.yaml index a45afdc1..47e9b881 100644 --- a/src/tests/bundles/kinetic-zed-ha-ovn.yaml +++ b/src/tests/bundles/kinetic-zed-ha-ovn.yaml @@ -173,13 +173,13 @@ applications: ovn-chassis-octavia: series: *series charm: ch:ovn-chassis - channel: 22.03/edge + channel: latest/edge options: ovn-source: distro octavia: constraints: cores=8 series: *series - charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 3 options: openstack-origin: *openstack-origin @@ -198,7 +198,7 @@ applications: name_prefix: 'ubuntu:released', path: 'streams/v1/index.sjson', max: 1, item_filters: [ - 'release~(kinetic)', + 'release~(jammy)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" channel: latest/edge @@ -225,10 +225,10 @@ applications: num_units: 3 options: source: *openstack-origin - channel: 22.03/edge + channel: latest/edge ovn-chassis: charm: ch:ovn-chassis - channel: 22.03/edge + channel: latest/edge options: ovn-source: distro vault: diff --git a/src/tests/bundles/kinetic-zed-ha.yaml b/src/tests/bundles/kinetic-zed-ha.yaml index e8136022..6fbe543d 100644 --- a/src/tests/bundles/kinetic-zed-ha.yaml +++ b/src/tests/bundles/kinetic-zed-ha.yaml @@ -187,7 +187,7 @@ applications: octavia: constraints: cores=8 series: *series - charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 3 options: openstack-origin: *openstack-origin @@ -207,7 +207,7 @@ applications: name_prefix: 'ubuntu:released', path: 'streams/v1/index.sjson', max: 1, item_filters: [ - 'release~(kinetic)', + 'release~(jammy)', 'arch~(x86_64|amd64)', 'ftype~(disk1.img|disk.img)']}]" channel: latest/edge diff --git a/src/tests/bundles/lunar-antelope-ha-ovn.yaml b/src/tests/bundles/lunar-antelope-ha-ovn.yaml new file mode 100644 index 00000000..9597f248 --- /dev/null +++ b/src/tests/bundles/lunar-antelope-ha-ovn.yaml @@ -0,0 +1,237 @@ +variables: + openstack-origin: &openstack-origin distro + +local_overlay_enabled: True + +series: &series lunar +relations: +- - glance:image-service + - nova-cloud-controller:image-service +- - glance:image-service + - nova-compute:image-service +- - glance-mysql-router:shared-db + - glance:shared-db +- - keystone-mysql-router:shared-db + - keystone:shared-db +- - neutron-mysql-router:shared-db + - neutron-api:shared-db +- - nova-mysql-router:shared-db + - nova-cloud-controller:shared-db +- - octavia-mysql-router:shared-db + - octavia:shared-db +- - keystone:identity-service + - glance:identity-service +- - keystone:identity-service + - nova-cloud-controller:identity-service +- - keystone:identity-service + - neutron-api:identity-service +- - keystone:identity-service + - octavia:identity-service +- - nova-compute:cloud-compute + - nova-cloud-controller:cloud-compute +- - rabbitmq-server:amqp + - neutron-api:amqp +- - rabbitmq-server:amqp + - glance:amqp +- - rabbitmq-server:amqp + - nova-cloud-controller:amqp +- - rabbitmq-server:amqp + - nova-compute:amqp +- - rabbitmq-server:amqp + - octavia:amqp +- - neutron-api:neutron-api + - nova-cloud-controller:neutron-api +- - neutron-api:neutron-load-balancer + - octavia:neutron-api +- - glance-simplestreams-sync:juju-info + - octavia-diskimage-retrofit:juju-info +- - keystone:identity-service + - glance-simplestreams-sync:identity-service +- - keystone:identity-credentials + - octavia-diskimage-retrofit:identity-credentials +- [ placement, placement-mysql-router ] +- [ placement, keystone ] +- [ placement, nova-cloud-controller ] +- - neutron-api-plugin-ovn:neutron-plugin + - neutron-api:neutron-plugin-api-subordinate +- - vault:shared-db + - vault-mysql-router:shared-db +- - ovn-central:certificates + - vault:certificates +- - ovn-central:ovsdb-cms + - neutron-api-plugin-ovn:ovsdb-cms +- - neutron-api:certificates + - vault:certificates +- - ovn-chassis:nova-compute + - nova-compute:neutron-plugin +- - ovn-chassis-octavia:ovsdb-subordinate + - octavia:ovsdb-subordinate +- - ovn-chassis-octavia:certificates + - vault:certificates +- - ovn-chassis-octavia:ovsdb + - ovn-central:ovsdb +- - ovn-central:ovsdb-cms + - octavia:ovsdb-cms +- - ovn-chassis:certificates + - vault:certificates +- - ovn-chassis:ovsdb + - ovn-central:ovsdb +- - vault:certificates + - neutron-api-plugin-ovn:certificates +- - vault:certificates + - glance:certificates +- - vault:certificates + - keystone:certificates +- - vault:certificates + - nova-cloud-controller:certificates +- - vault:certificates + - placement:certificates +- - vault:certificates + - octavia:certificates +- - vault:certificates + - glance-simplestreams-sync:certificates +- - hacluster-octavia:ha + - octavia:ha +- ["octavia-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +- ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] +applications: + glance: + charm: ch:glance + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: latest/edge + keystone: + charm: ch:keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + channel: latest/edge + octavia-mysql-router: + charm: ch:mysql-router + channel: latest/edge + keystone-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 + neutron-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 + mysql-innodb-cluster: + constraints: mem=3072M + charm: ch:mysql-innodb-cluster + num_units: 3 + channel: latest/edge + neutron-api: + constraints: cores=4 + charm: ch:neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + flat-network-providers: physnet1 + enable-ml2-port-security: True + neutron-security-groups: True + channel: latest/edge + nova-cloud-controller: + constraints: mem=7168M + charm: ch:nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: True + network-manager: Neutron + channel: latest/edge + nova-compute: + constraints: mem=7168M + charm: ch:nova-compute + num_units: 2 + options: + openstack-origin: *openstack-origin + debug: True + channel: latest/edge + hacluster-octavia: + series: *series + charm: ch:hacluster + channel: latest/edge + ovn-chassis-octavia: + series: *series + charm: ch:ovn-chassis + channel: latest/edge + options: + ovn-source: distro + octavia: + constraints: cores=8 + series: *series + charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm + num_units: 3 + options: + openstack-origin: *openstack-origin + debug: True + loadbalancer-topology: 'ACTIVE_STANDBY' + rabbitmq-server: + charm: ch:rabbitmq-server + num_units: 1 + channel: latest/edge + glance-simplestreams-sync: + charm: ch:glance-simplestreams-sync + num_units: 1 + options: + use_swift: False + mirror_list: "[{url: 'http://cloud-images.ubuntu.com/releases/', + name_prefix: 'ubuntu:released', + path: 'streams/v1/index.sjson', max: 1, + item_filters: [ + 'release~(jammy)', + 'arch~(x86_64|amd64)', + 'ftype~(disk1.img|disk.img)']}]" + channel: latest/edge + octavia-diskimage-retrofit: + charm: ch:octavia-diskimage-retrofit + options: + amp-image-tag: 'octavia-amphora' + retrofit-series: *series + channel: latest/edge + placement: + charm: ch:placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + debug: true + channel: latest/edge + neutron-api-plugin-ovn: + charm: ch:neutron-api-plugin-ovn + channel: latest/edge + ovn-central: + constraints: mem=3072M + charm: ch:ovn-central + num_units: 3 + options: + source: *openstack-origin + channel: latest/edge + ovn-chassis: + charm: ch:ovn-chassis + channel: latest/edge + options: + ovn-source: distro + vault: + charm: ch:vault + num_units: 1 + channel: latest/edge diff --git a/src/tests/bundles/jammy-yoga-ha.yaml b/src/tests/bundles/lunar-antelope-ha.yaml similarity index 98% rename from src/tests/bundles/jammy-yoga-ha.yaml rename to src/tests/bundles/lunar-antelope-ha.yaml index 57c522ce..633989cd 100644 --- a/src/tests/bundles/jammy-yoga-ha.yaml +++ b/src/tests/bundles/lunar-antelope-ha.yaml @@ -3,7 +3,7 @@ variables: local_overlay_enabled: True -series: &series jammy +series: &series lunar relations: - - glance:image-service - nova-cloud-controller:image-service @@ -181,14 +181,13 @@ applications: debug: True channel: latest/edge hacluster-octavia: - series: *series charm: ch:hacluster num_units: 0 channel: latest/edge octavia: constraints: cores=8 series: *series - charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64.charm + charm: ../../../octavia_ubuntu-22.04-amd64_ubuntu-22.10-amd64_ubuntu-23.04-amd64.charm num_units: 3 options: openstack-origin: *openstack-origin @@ -216,7 +215,6 @@ applications: charm: ch:octavia-diskimage-retrofit options: amp-image-tag: 'octavia-amphora' - retrofit-uca-pocket: yoga retrofit-series: *series channel: latest/edge placement: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 0c3e4743..dc27f0d3 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,19 +1,19 @@ charm_name: octavia gate_bundles: -- jammy-yoga-ha-ovn -- jammy-yoga-ha - -smoke_bundles: -- jammy-yoga-ha - -dev_bundles: -- jammy-yoga-ha-ovn -- jammy-yoga-ha - jammy-zed-ha-ovn - jammy-zed-ha + +smoke_bundles: +- jammy-zed-ha + +dev_bundles: +- jammy-antelope-ha-ovn +- jammy-antelope-ha - kinetic-zed-ha-ovn - kinetic-zed-ha +- lunar-antelope-ha-ovn +- lunar-antelope-ha comment: | @@ -76,3 +76,5 @@ tests_options: force_deploy: - kinetic-zed-ha-ovn - kinetic-zed-ha + - lunar-antelope-ha-ovn + - lunar-antelope-ha