From 14d3bb727dac77964175f77d3e1b7b77a190a7cd Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Tue, 17 May 2022 19:18:06 +0100 Subject: [PATCH] Migrate charm charmhub for stable/wallaby - start from stable/wallaby branch - Do charmcraft, osci, zuul changes - Modify libs to point to stable/wallaby for: - charmhelpers - charms.openstack (as needed) - zaza & zaza.openstack.tests - Remove unsupported test bundles - migration bundles to charmhub.io (ch: prefix + channels) - Build on 20.04 amd64 - Run on 20.04 amd64, s390x, ppc64el, arm64 Change-Id: I36a7c2d3578512a65392526f7e08eb72800ab5d7 --- .gitignore | 1 + .gitreview | 2 +- .zuul.yaml | 3 +- build-requirements.txt | 7 + charm-helpers-hooks.yaml | 2 +- charmcraft.yaml | 31 ++++ metadata.yaml | 5 - osci.yaml | 35 ++-- rename.sh | 13 ++ test-requirements.txt | 8 +- tests/bundles/bionic-queens.yaml | 130 -------------- tests/bundles/bionic-rocky.yaml | 130 -------------- tests/bundles/bionic-stein.yaml | 130 -------------- tests/bundles/bionic-train.yaml | 143 --------------- tests/bundles/bionic-ussuri.yaml | 144 --------------- tests/bundles/focal-ussuri.yaml | 270 ----------------------------- tests/bundles/focal-victoria.yaml | 64 ++++--- tests/bundles/focal-wallaby.yaml | 64 ++++--- tests/bundles/focal-xena.yaml | 270 ----------------------------- tests/bundles/groovy-victoria.yaml | 270 ----------------------------- tests/bundles/hirsute-wallaby.yaml | 270 ----------------------------- tests/bundles/impish-xena.yaml | 270 ----------------------------- tests/bundles/trusty-mitaka.yaml | 130 -------------- tests/bundles/xenial-mitaka.yaml | 130 -------------- tests/bundles/xenial-ocata.yaml | 130 -------------- tests/bundles/xenial-pike.yaml | 130 -------------- tests/bundles/xenial-queens.yaml | 130 -------------- tests/tests.yaml | 23 +-- tox.ini | 34 ++-- 29 files changed, 198 insertions(+), 2771 deletions(-) create mode 100644 build-requirements.txt create mode 100644 charmcraft.yaml create mode 100755 rename.sh delete mode 100644 tests/bundles/bionic-queens.yaml delete mode 100644 tests/bundles/bionic-rocky.yaml delete mode 100644 tests/bundles/bionic-stein.yaml delete mode 100644 tests/bundles/bionic-train.yaml delete mode 100644 tests/bundles/bionic-ussuri.yaml delete mode 100644 tests/bundles/focal-ussuri.yaml delete mode 100644 tests/bundles/focal-xena.yaml delete mode 100644 tests/bundles/groovy-victoria.yaml delete mode 100644 tests/bundles/hirsute-wallaby.yaml delete mode 100644 tests/bundles/impish-xena.yaml delete mode 100644 tests/bundles/trusty-mitaka.yaml delete mode 100644 tests/bundles/xenial-mitaka.yaml delete mode 100644 tests/bundles/xenial-ocata.yaml delete mode 100644 tests/bundles/xenial-pike.yaml delete mode 100644 tests/bundles/xenial-queens.yaml diff --git a/.gitignore b/.gitignore index 8155fd77..dbe79388 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ xenial .unit-state.db func-results.json __pycache__ +*.charm diff --git a/.gitreview b/.gitreview index 325ec351..a02a3374 100644 --- a/.gitreview +++ b/.gitreview @@ -3,4 +3,4 @@ host=review.opendev.org port=29418 project=openstack/charm-neutron-gateway.git -defaultbranch=stable/21.10 +defaultbranch=stable/wallaby diff --git a/.zuul.yaml b/.zuul.yaml index b3037e94..8cd637fb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,4 @@ - project: templates: - - python35-charm-jobs - - openstack-python3-ussuri-jobs + - openstack-python3-wallaby-jobs - openstack-cover-jobs diff --git a/build-requirements.txt b/build-requirements.txt new file mode 100644 index 00000000..b6d2452f --- /dev/null +++ b/build-requirements.txt @@ -0,0 +1,7 @@ +# NOTES(lourot): +# * We don't install charmcraft via pip anymore because it anyway spins up a +# container and scp the system's charmcraft snap inside it. So the charmcraft +# snap is necessary on the system anyway. +# * `tox -e build` successfully validated with charmcraft 1.2.1 + +cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 4ebc2191..94ce00a1 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,4 +1,4 @@ -repo: https://github.com/juju/charm-helpers@stable/21.10 +repo: https://github.com/juju/charm-helpers@stable/wallaby destination: hooks/charmhelpers include: - core diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 00000000..12c246af --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,31 @@ +type: charm + +parts: + charm: + plugin: dump + source: . + prime: + - actions/* + - files/* + - hooks/* + - lib/* + - templates/* + - actions.yaml + - config.yaml + - copyright + - hardening.yaml + - icon.svg + - Makefile + - metadata.yaml + - README.md + +bases: + - build-on: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 + run-on: + - name: ubuntu + channel: "20.04" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/metadata.yaml b/metadata.yaml index fb95f454..99b04ea5 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -16,12 +16,7 @@ description: | tags: - openstack series: -- xenial -- bionic - focal -- groovy -- hirsute -- impish extra-bindings: data: provides: diff --git a/osci.yaml b/osci.yaml index 2f766fc0..b63473c2 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,14 +1,29 @@ - project: templates: - - charm-unit-jobs - - charm-functional-jobs + - charm-unit-jobs-py38 check: jobs: - - focal-xena: - voting: false - - impish-xena: - voting: false - # disabled as test flaps: - # Bug: https://bugs.launchpad.net/charm-neutron-gateway/+bug/1945746 - - hirsute-wallaby: - voting: false + - focal-victoria_neutron-gateway-ovn + - focal-wallaby_neutron-gateway-ovn + vars: + needs_charm_build: true + charm_build_name: neutron-gateway + build_type: charmcraft + +- job: + name: focal-victoria_neutron-gateway-ovn + parent: func-target + dependencies: + - charm-build + - osci-lint + - tox-py38 + vars: + tox_extra_args: "migrate-ovn:focal-victoria" + +- job: + name: focal-wallaby_neutron-gateway-ovn + parent: func-target + dependencies: + - focal-victoria_neutron-gateway-ovn + vars: + tox_extra_args: "migrate-ovn:focal-wallaby" diff --git a/rename.sh b/rename.sh new file mode 100755 index 00000000..d0c35c97 --- /dev/null +++ b/rename.sh @@ -0,0 +1,13 @@ +#!/bin/bash +charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}') +echo "renaming ${charm}_*.charm to ${charm}.charm" +echo -n "pwd: " +pwd +ls -al +echo "Removing bad downloaded charm maybe?" +if [[ -e "${charm}.charm" ]]; +then + rm "${charm}.charm" +fi +echo "Renaming charm here." +mv ${charm}_*.charm ${charm}.charm diff --git a/test-requirements.txt b/test-requirements.txt index 0a7e94a0..42df5315 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,7 @@ # requirements. They are intertwined. Also, Zaza itself should specify # all of its own requirements and if it doesn't, fix it there. # +pyparsing<3.0.0 # cffi needs pyparsing < 3.0.0. cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 @@ -37,11 +38,12 @@ oslo.utils<=3.41.0;python_version<'3.6' coverage>=4.5.2 pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking) -git+https://github.com/openstack-charmers/zaza.git@stable/21.10#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.10#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/wallaby#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/wallaby#egg=zaza.openstack # Needed for charm-glance: -git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6' +git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8' +tempest<31.0.0;python_version<'3.8' and python_version>='3.6' tempest<24.0.0;python_version<'3.6' croniter # needed for charm-rabbitmq-server unit tests diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 49d8102a..00000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,130 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index dbe76a0d..00000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,130 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-rocky - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 12d37152..00000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,130 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-stein - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml deleted file mode 100644 index 42e70001..00000000 --- a/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,143 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-train - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - 9: {} -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - 'placement:shared-db' - - 'percona-cluster:shared-db' - - - 'placement:identity-service' - - 'keystone:identity-service' - - - 'placement:placement' - - 'nova-cloud-controller:placement' diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index eb5a94a3..00000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,144 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-ussuri - -series: &series bionic - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - 9: {} -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - 'placement:shared-db' - - 'percona-cluster:shared-db' - - - 'placement:identity-service' - - 'keystone:identity-service' - - - 'placement:placement' - - 'nova-cloud-controller:placement' diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 315c8d08..00000000 --- a/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,270 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series focal - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: - constraints: "mem=4G" - 9: - constraints: "root-disk=20G mem=4G" - 10: - constraints: "root-disk=20G mem=4G" - 11: {} - 12: {} - 13: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - options: - source: *openstack-origin - to: - - '3' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '7' - - ovn-dedicated-chassis: - charm: cs:~openstack-charmers/ovn-dedicated-chassis - num_units: 1 - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - to: - # NOTE: We deliberately colocate the ovn-dedicated-chassis with the - # neutron-gateway for migration test purposes. - - '7' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '8' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '9' - - '10' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - vault-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - ovn-central: - charm: cs:~openstack-charmers/ovn-central - num_units: 3 - options: - source: *openstack-origin - to: - - '13' - neutron-api-plugin-ovn: - charm: cs:~openstack-charmers/neutron-api-plugin-ovn - ovn-chassis: - charm: cs:~openstack-charmers/ovn-chassis - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - -relations: - - - - '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:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - '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' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - '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' - - # We need to defer the addition of the neutron-api-plugin-ovn subordinate - # relation to the functional test as the test will first validate the legacy - # Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity - # post migration. - # - # - - neutron-api-plugin-ovn:neutron-plugin - # - neutron-api:neutron-plugin-api-subordinate - - - ovn-central:certificates - - vault:certificates - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - ovn-dedicated-chassis:certificates - - vault:certificates - - - ovn-dedicated-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:shared-db - - vault-mysql-router:shared-db - - - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index c7f5a767..54a02a51 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-victoria @@ -30,18 +32,23 @@ machines: applications: neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -49,18 +56,20 @@ applications: - '0' - '1' - '2' + channel: 8.0/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: options: source: *openstack-origin to: - '3' + channel: 3.8/edge neutron-api: - charm: cs:~openstack-charmers/neutron-api + charm: ch:neutron-api series: *series num_units: 1 options: @@ -70,27 +79,31 @@ applications: openstack-origin: *openstack-origin to: - '4' + channel: wallaby/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: wallaby/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: wallaby/edge neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: wallaby/edge neutron-gateway: - charm: "../../../neutron-gateway" + charm: ../../neutron-gateway.charm num_units: 1 options: bridge-mappings: physnet1:br-ex @@ -99,7 +112,7 @@ applications: - '7' ovn-dedicated-chassis: - charm: cs:~openstack-charmers/ovn-dedicated-chassis + charm: ch:ovn-dedicated-chassis num_units: 1 options: # start new units paused to allow unit by unit OVS to OVN migration @@ -108,54 +121,63 @@ applications: # NOTE: We deliberately colocate the ovn-dedicated-chassis with the # neutron-gateway for migration test purposes. - '7' + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin to: - '8' + channel: wallaby/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin to: - '9' - '10' + channel: wallaby/edge placement: - charm: cs:~openstack-charmers/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '11' + channel: wallaby/edge vault-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge vault: - charm: cs:~openstack-charmers/vault + charm: ch:vault num_units: 1 to: - '12' + channel: 1.7/edge ovn-central: - charm: cs:~openstack-charmers/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin to: - '13' + channel: latest/edge neutron-api-plugin-ovn: - charm: cs:~openstack-charmers/neutron-api-plugin-ovn + charm: ch:neutron-api-plugin-ovn + channel: wallaby/edge ovn-chassis: - charm: cs:~openstack-charmers/ovn-chassis + charm: ch:ovn-chassis options: # start new units paused to allow unit by unit OVS to OVN migration new-units-paused: true + channel: latest/edge relations: diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml index 51d56417..57434413 100644 --- a/tests/bundles/focal-wallaby.yaml +++ b/tests/bundles/focal-wallaby.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin cloud:focal-wallaby @@ -30,18 +32,23 @@ machines: applications: neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -49,18 +56,20 @@ applications: - '0' - '1' - '2' + channel: 8.0/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: options: source: *openstack-origin to: - '3' + channel: 3.8/edge neutron-api: - charm: cs:~openstack-charmers/neutron-api + charm: ch:neutron-api series: *series num_units: 1 options: @@ -70,27 +79,31 @@ applications: openstack-origin: *openstack-origin to: - '4' + channel: wallaby/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: wallaby/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: wallaby/edge neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: wallaby/edge neutron-gateway: - charm: "../../../neutron-gateway" + charm: ../../neutron-gateway.charm num_units: 1 options: bridge-mappings: physnet1:br-ex @@ -99,7 +112,7 @@ applications: - '7' ovn-dedicated-chassis: - charm: cs:~openstack-charmers/ovn-dedicated-chassis + charm: ch:ovn-dedicated-chassis num_units: 1 options: # start new units paused to allow unit by unit OVS to OVN migration @@ -108,54 +121,63 @@ applications: # NOTE: We deliberately colocate the ovn-dedicated-chassis with the # neutron-gateway for migration test purposes. - '7' + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin to: - '8' + channel: wallaby/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 2 options: openstack-origin: *openstack-origin to: - '9' - '10' + channel: wallaby/edge placement: - charm: cs:~openstack-charmers/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '11' + channel: wallaby/edge vault-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge vault: - charm: cs:~openstack-charmers/vault + charm: ch:vault num_units: 1 to: - '12' + channel: 1.7/edge ovn-central: - charm: cs:~openstack-charmers/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin to: - '13' + channel: latest/edge neutron-api-plugin-ovn: - charm: cs:~openstack-charmers/neutron-api-plugin-ovn + charm: ch:neutron-api-plugin-ovn + channel: wallaby/edge ovn-chassis: - charm: cs:~openstack-charmers/ovn-chassis + charm: ch:ovn-chassis options: # start new units paused to allow unit by unit OVS to OVN migration new-units-paused: true + channel: latest/edge relations: diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml deleted file mode 100644 index 83c83719..00000000 --- a/tests/bundles/focal-xena.yaml +++ /dev/null @@ -1,270 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-xena - -series: &series focal - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: - constraints: "mem=4G" - 9: - constraints: "root-disk=20G mem=4G" - 10: - constraints: "root-disk=20G mem=4G" - 11: {} - 12: {} - 13: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - options: - source: *openstack-origin - to: - - '3' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '7' - - ovn-dedicated-chassis: - charm: cs:~openstack-charmers/ovn-dedicated-chassis - num_units: 1 - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - to: - # NOTE: We deliberately colocate the ovn-dedicated-chassis with the - # neutron-gateway for migration test purposes. - - '7' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '8' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '9' - - '10' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - vault-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - ovn-central: - charm: cs:~openstack-charmers/ovn-central - num_units: 3 - options: - source: *openstack-origin - to: - - '13' - neutron-api-plugin-ovn: - charm: cs:~openstack-charmers/neutron-api-plugin-ovn - ovn-chassis: - charm: cs:~openstack-charmers/ovn-chassis - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - -relations: - - - - '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:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - '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' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - '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' - - # We need to defer the addition of the neutron-api-plugin-ovn subordinate - # relation to the functional test as the test will first validate the legacy - # Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity - # post migration. - # - # - - neutron-api-plugin-ovn:neutron-plugin - # - neutron-api:neutron-plugin-api-subordinate - - - ovn-central:certificates - - vault:certificates - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - ovn-dedicated-chassis:certificates - - vault:certificates - - - ovn-dedicated-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:shared-db - - vault-mysql-router:shared-db - - - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml deleted file mode 100644 index 5d710809..00000000 --- a/tests/bundles/groovy-victoria.yaml +++ /dev/null @@ -1,270 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series groovy - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: - constraints: "mem=4G" - 9: - constraints: "root-disk=20G mem=4G" - 10: - constraints: "root-disk=20G mem=4G" - 11: {} - 12: {} - 13: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - options: - source: *openstack-origin - to: - - '3' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '7' - - ovn-dedicated-chassis: - charm: cs:~openstack-charmers/ovn-dedicated-chassis - num_units: 1 - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - to: - # NOTE: We deliberately colocate the ovn-dedicated-chassis with the - # neutron-gateway for migration test purposes. - - '7' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '8' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '9' - - '10' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - vault-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - ovn-central: - charm: cs:~openstack-charmers/ovn-central - num_units: 3 - options: - source: *openstack-origin - to: - - '13' - neutron-api-plugin-ovn: - charm: cs:~openstack-charmers/neutron-api-plugin-ovn - ovn-chassis: - charm: cs:~openstack-charmers/ovn-chassis - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - -relations: - - - - '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:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - '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' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - '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' - - # We need to defer the addition of the neutron-api-plugin-ovn subordinate - # relation to the functional test as the test will first validate the legacy - # Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity - # post migration. - # - # - - neutron-api-plugin-ovn:neutron-plugin - # - neutron-api:neutron-plugin-api-subordinate - - - ovn-central:certificates - - vault:certificates - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - ovn-dedicated-chassis:certificates - - vault:certificates - - - ovn-dedicated-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:shared-db - - vault-mysql-router:shared-db - - - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index bbd63ee1..00000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,270 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series hirsute - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: - constraints: "mem=4G" - 9: - constraints: "root-disk=20G mem=4G" - 10: - constraints: "root-disk=20G mem=4G" - 11: {} - 12: {} - 13: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - options: - source: *openstack-origin - to: - - '3' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '7' - - ovn-dedicated-chassis: - charm: cs:~openstack-charmers/ovn-dedicated-chassis - num_units: 1 - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - to: - # NOTE: We deliberately colocate the ovn-dedicated-chassis with the - # neutron-gateway for migration test purposes. - - '7' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '8' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '9' - - '10' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - vault-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - ovn-central: - charm: cs:~openstack-charmers/ovn-central - num_units: 3 - options: - source: *openstack-origin - to: - - '13' - neutron-api-plugin-ovn: - charm: cs:~openstack-charmers/neutron-api-plugin-ovn - ovn-chassis: - charm: cs:~openstack-charmers/ovn-chassis - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - -relations: - - - - '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:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - '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' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - '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' - - # We need to defer the addition of the neutron-api-plugin-ovn subordinate - # relation to the functional test as the test will first validate the legacy - # Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity - # post migration. - # - # - - neutron-api-plugin-ovn:neutron-plugin - # - neutron-api:neutron-plugin-api-subordinate - - - ovn-central:certificates - - vault:certificates - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - ovn-dedicated-chassis:certificates - - vault:certificates - - - ovn-dedicated-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:shared-db - - vault-mysql-router:shared-db - - - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml deleted file mode 100644 index 18aab748..00000000 --- a/tests/bundles/impish-xena.yaml +++ /dev/null @@ -1,270 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series impish - -machines: - 0: - constraints: "mem=3072M" - 1: - constraints: "mem=3072M" - 2: - constraints: "mem=3072M" - 3: {} - 4: {} - 5: {} - 6: {} - 7: {} - 8: - constraints: "mem=4G" - 9: - constraints: "root-disk=20G mem=4G" - 10: - constraints: "root-disk=20G mem=4G" - 11: {} - 12: {} - 13: {} - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - options: - source: *openstack-origin - to: - - '3' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '7' - - ovn-dedicated-chassis: - charm: cs:~openstack-charmers/ovn-dedicated-chassis - num_units: 1 - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - to: - # NOTE: We deliberately colocate the ovn-dedicated-chassis with the - # neutron-gateway for migration test purposes. - - '7' - - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '8' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '9' - - '10' - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '11' - - vault-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - ovn-central: - charm: cs:~openstack-charmers/ovn-central - num_units: 3 - options: - source: *openstack-origin - to: - - '13' - neutron-api-plugin-ovn: - charm: cs:~openstack-charmers/neutron-api-plugin-ovn - ovn-chassis: - charm: cs:~openstack-charmers/ovn-chassis - options: - # start new units paused to allow unit by unit OVS to OVN migration - new-units-paused: true - -relations: - - - - '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:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - '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' - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - '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' - - # We need to defer the addition of the neutron-api-plugin-ovn subordinate - # relation to the functional test as the test will first validate the legacy - # Neutron ML2+OVS topology, migrate it to OVN and then confirm connectivity - # post migration. - # - # - - neutron-api-plugin-ovn:neutron-plugin - # - neutron-api:neutron-plugin-api-subordinate - - - ovn-central:certificates - - vault:certificates - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - ovn-dedicated-chassis:certificates - - vault:certificates - - - ovn-dedicated-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:shared-db - - vault-mysql-router:shared-db - - - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml deleted file mode 100644 index 892f8b10..00000000 --- a/tests/bundles/trusty-mitaka.yaml +++ /dev/null @@ -1,130 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:trusty-mitaka - -series: &series trusty - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:trusty/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml deleted file mode 100644 index ab825670..00000000 --- a/tests/bundles/xenial-mitaka.yaml +++ /dev/null @@ -1,130 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series xenial - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml deleted file mode 100644 index 7d48587f..00000000 --- a/tests/bundles/xenial-ocata.yaml +++ /dev/null @@ -1,130 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:xenial-ocata - -series: &series xenial - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml deleted file mode 100644 index 4563537f..00000000 --- a/tests/bundles/xenial-pike.yaml +++ /dev/null @@ -1,130 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:xenial-pike - -series: &series xenial - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml deleted file mode 100644 index 493626c7..00000000 --- a/tests/bundles/xenial-queens.yaml +++ /dev/null @@ -1,130 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:xenial-queens - -series: &series xenial - -machines: - 0: - constraints: "mem=3072M" - 1: {} - 2: {} - 3: {} - 4: {} - 5: {} - 6: - constraints: "mem=4G" - 7: - constraints: "root-disk=20G mem=4G" - 8: - constraints: "root-disk=20G mem=4G" - -# We specify machine placements for these to improve iteration -# time, given that machine "0" comes up way before machine "7" -applications: - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *openstack-origin - to: - - '0' - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '1' - neutron-api: - charm: cs:~openstack-charmers/neutron-api - series: *series - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - to: - - '2' - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '4' - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - neutron-gateway: - charm: "../../../neutron-gateway" - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - openstack-origin: *openstack-origin - to: - - '5' - nova-cloud-controller: - charm: cs:~openstack-charmers/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - to: - - '6' - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - options: - openstack-origin: *openstack-origin - to: - - '7' - - '8' -relations: - - - 'neutron-api:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - 'neutron-api:neutron-plugin-api' - - 'neutron-gateway:neutron-plugin-api' - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - 'keystone:shared-db' - - 'percona-cluster:shared-db' - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - 'nova-cloud-controller:shared-db' - - 'percona-cluster:shared-db' - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:amqp' - - 'rabbitmq-server:amqp' - - - 'neutron-openvswitch:neutron-plugin-api' - - 'neutron-api:neutron-plugin-api' - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - 'glance:identity-service' - - 'keystone:identity-service' - - - 'glance:shared-db' - - 'percona-cluster:shared-db' - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - 'nova-compute:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' diff --git a/tests/tests.yaml b/tests/tests.yaml index edb5606d..ff86bc48 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -6,28 +6,13 @@ charm_name: neutron-gateway # OVS to OVN. # smoke_bundles: - - migrate-ovn: focal-ussuri + - migrate-ovn: focal-wallaby gate_bundles: - - migrate-ovn: groovy-victoria - migrate-ovn: focal-wallaby - migrate-ovn: focal-victoria - - migrate-ovn: focal-ussuri - - bionic-ussuri - - bionic-train - - bionic-stein - - bionic-queens - - xenial-mitaka -dev_bundles: - - trusty-mitaka - - xenial-ocata - - xenial-pike - - xenial-queens - - bionic-rocky - - migrate-ovn: focal-xena - - migrate-ovn: hirsute-wallaby - - migrate-ovn: impish-xena +dev_bundles: [] target_deploy_status: neutron-api-plugin-ovn: @@ -91,6 +76,4 @@ tests_options: # reusing the instances created for the first run. This both saves time and # allows verifying instances survive a SDN migration. zaza.openstack.charm_tests.neutron.tests.NeutronNetworkingTest.test_instances_have_networking.run_resource_cleanup: false - force_deploy: - - groovy-victoria - - impish-xena + force_deploy: [] diff --git a/tox.ini b/tox.ini index ba4fd5b6..c41077de 100644 --- a/tox.ini +++ b/tox.ini @@ -37,12 +37,22 @@ setenv = VIRTUAL_ENV={envdir} install_command = {toxinidir}/pip.sh install {opts} {packages} commands = stestr run --slowest {posargs} -allowlist_externals = juju +allowlist_externals = + charmcraft + rename.sh passenv = HOME TERM CS_* OS_* TEST_* deps = -r{toxinidir}/test-requirements.txt -[testenv:py35] -basepython = python3.5 +[testenv:build] +basepython = python3 +deps = -r{toxinidir}/build-requirements.txt +commands = + charmcraft clean + charmcraft -v build + {toxinidir}/rename.sh + +[testenv:py3] +basepython = python3 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt @@ -50,21 +60,25 @@ deps = -r{toxinidir}/requirements.txt basepython = python3.6 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - -[testenv:py37] -basepython = python3.7 -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} [testenv:py38] basepython = python3.8 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} -[testenv:py3] -basepython = python3 +[testenv:py39] +basepython = python3.9 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} + +[testenv:py310] +basepython = python3.10 +deps = -r{toxinidir}/requirements.txt + -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} [testenv:pep8] basepython = python3