From e3655ca69159d0b6a6b4e07561808dcd811ef686 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 20 May 2022 20:05:19 +0100 Subject: [PATCH] Migrate charm charmhub for stable/ussuri - start from stable/ussuri branch - Do charmcraft, osci, zuul changes - Modify libs to point to stable/ussuri for: - charmhelpers - charms.openstack (as needed) - zaza & zaza.openstack.tests - Remove unsupported test bundles - migration bundles to charmhub.io (ch: prefix + channels) - Build on 18.04 amd64 - Run on 18.04 amd64, s390x, ppc64el, arm64 - Run on 20.04 amd64, s390x, ppc64el, arm64 Change-Id: Ia7601cb12d48054f13d6b42e72390f37797ddc46 --- .gitignore | 1 + .gitreview | 2 +- .zuul.yaml | 1 - build-requirements.txt | 7 + charm-helpers-hooks.yaml | 2 +- charmcraft.yaml | 37 +++++ metadata.yaml | 4 - osci.yaml | 69 +++------ rename.sh | 13 ++ test-requirements.txt | 7 +- tests/bundles/bionic-queens.yaml | 92 ----------- tests/bundles/bionic-rocky.yaml | 100 ------------ tests/bundles/bionic-stein.yaml | 100 ------------ tests/bundles/bionic-train.yaml | 31 ++-- tests/bundles/bionic-ussuri.yaml | 31 ++-- tests/bundles/focal-ussuri.yaml | 52 +++++-- tests/bundles/focal-victoria.yaml | 241 ----------------------------- tests/bundles/focal-wallaby.yaml | 241 ----------------------------- tests/bundles/focal-xena.yaml | 241 ----------------------------- tests/bundles/groovy-victoria.yaml | 241 ----------------------------- tests/bundles/hirsute-wallaby.yaml | 241 ----------------------------- tests/bundles/impish-xena.yaml | 241 ----------------------------- tests/bundles/xenial-mitaka.yaml | 90 ----------- tests/bundles/xenial-ocata.yaml | 100 ------------ tests/bundles/xenial-pike.yaml | 100 ------------ tests/bundles/xenial-queens.yaml | 100 ------------ tests/tests.yaml | 19 +-- tox.ini | 30 +++- 28 files changed, 190 insertions(+), 2244 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/focal-victoria.yaml delete mode 100644 tests/bundles/focal-wallaby.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/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 006568ac..48f02cfa 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ tests/cirros-*-disk.img func*.json .stestr __pycache__ +*.charm diff --git a/.gitreview b/.gitreview index a7df82c1..11f36d67 100644 --- a/.gitreview +++ b/.gitreview @@ -3,4 +3,4 @@ host=review.opendev.org port=29418 project=openstack/charm-nova-cloud-controller.git -defaultbranch=stable/21.10 +defaultbranch=stable/ussuri diff --git a/.zuul.yaml b/.zuul.yaml index b3037e94..0eed1965 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,5 +1,4 @@ - project: templates: - - python35-charm-jobs - openstack-python3-ussuri-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 aa7ac128..21781a6f 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/ussuri destination: charmhelpers include: - core diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 00000000..9ce83017 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,37 @@ +type: charm + +parts: + charm: + plugin: dump + source: . + prime: + - actions/* + - charmhelpers/* + - files/* + - hooks/* + - lib/* + - scripts/* + - templates/* + - actions.yaml + - config.yaml + - copyright + - hardening.yaml + - icon.svg + - LICENSE + - Makefile + - metadata.yaml + - README.md + +bases: + - build-on: + - name: ubuntu + channel: "18.04" + architectures: + - amd64 + run-on: + - name: ubuntu + channel: "18.04" + architectures: [amd64, s390x, ppc64el, arm64] + - name: ubuntu + channel: "20.04" + architectures: [amd64, s390x, ppc64el, arm64] diff --git a/metadata.yaml b/metadata.yaml index 6ae0a768..2ea22983 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -16,12 +16,8 @@ description: | tags: - openstack series: -- xenial - bionic - focal -- groovy -- hirsute -- impish extra-bindings: public: admin: diff --git a/osci.yaml b/osci.yaml index 23b20f25..9ed27210 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,64 +1,39 @@ - project: templates: - - charm-unit-jobs + - charm-unit-jobs-py36 + - charm-unit-jobs-py38 check: jobs: - - vault-impish-xena: - voting: false - - vault-hirsute-wallaby - - vault-groovy-victoria - - vault-focal-xena: - voting: false - - vault-focal-wallaby - - vault-focal-victoria - vault-focal-ussuri - - bionic-ussuri - - bionic-train - - bionic-stein - - bionic-queens - - xenial-mitaka: - voting: false + - sync_az-bionic-ussuri + - sync_az-bionic-train + vars: + needs_charm_build: true + charm_build_name: nova-cloud-controller + build_type: charmcraft - job: name: vault-focal-ussuri parent: func-target - dependencies: &smoke-jobs - - bionic-ussuri + dependencies: + - charm-build + - osci-lint + - tox-py38 vars: tox_extra_args: vault:focal-ussuri - job: - name: vault-focal-victoria + name: sync_az-bionic-ussuri parent: func-target - dependencies: *smoke-jobs + dependencies: + - charm-build + - osci-lint + - tox-py38 vars: - tox_extra_args: vault:focal-victoria + tox_extra_args: sync_az:bionic-ussuri - job: - name: vault-focal-wallaby + name: sync_az-bionic-train parent: func-target - dependencies: *smoke-jobs + dependencies: + - sync_az-bionic-ussuri vars: - tox_extra_args: vault:focal-wallaby -- job: - name: vault-focal-xena - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: vault:focal-xena -- job: - name: vault-groovy-victoria - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: vault:groovy-victoria -- job: - name: vault-hirsute-wallaby - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: vault:hirsute-wallaby -- job: - name: vault-impish-xena - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: vault:impish-xena + tox_extra_args: sync_az:bionic-train 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 60b06f24..5b220c0f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -38,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/ussuri#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/ussuri#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' 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 e957ffce..00000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,92 +0,0 @@ -series: bionic -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -applications: - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - dataset-size: 25% - root-password: ChangeMe123 - sst-password: ChangeMe123 - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - constraints: mem=4G cores=4 - options: - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 8ddfbf20..00000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,100 +0,0 @@ -series: bionic -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -applications: - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - dataset-size: 25% - root-password: ChangeMe123 - sst-password: ChangeMe123 - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - constraints: mem=4G cores=4 - options: - openstack-origin: cloud:bionic-rocky - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 499ab1b7..00000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,100 +0,0 @@ -series: bionic -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -applications: - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - dataset-size: 25% - root-password: ChangeMe123 - sst-password: ChangeMe123 - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - constraints: mem=4G cores=4 - options: - openstack-origin: cloud:bionic-stein - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 54026307..c6bd1baf 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + series: bionic relations: - - nova-compute:image-service @@ -46,10 +48,11 @@ relations: - nova-cloud-controller:placement applications: rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge percona-cluster: - charm: cs:~openstack-charmers/percona-cluster + charm: ch:percona-cluster num_units: 1 options: max-connections: 1000 @@ -57,8 +60,9 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 + channel: 5.7/edge nova-cloud-controller: - charm: ../../../nova-cloud-controller + charm: ../../nova-cloud-controller.charm num_units: 1 options: openstack-origin: cloud:bionic-train @@ -68,37 +72,43 @@ applications: vendor-data-url: http://some.url/vdata debug: true neutron-api: - charm: cs:~openstack-charmers/neutron-api + charm: ch:neutron-api num_units: 1 options: openstack-origin: cloud:bionic-train flat-network-providers: physnet1 neutron-security-groups: true + channel: ussuri/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: cloud:bionic-train + channel: ussuri/edge neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-train bridge-mappings: physnet1:br-ex + channel: ussuri/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: cloud:bionic-train + channel: ussuri/edge neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: ussuri/edge placement: - charm: cs:~openstack-charmers/placement + charm: ch:placement num_units: 1 options: openstack-origin: cloud:bionic-train + channel: ussuri/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 2 constraints: mem=4G cores=4 options: @@ -109,3 +119,4 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true + channel: ussuri/edge diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index 08f35655..43f346d6 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + series: bionic relations: - - nova-compute:image-service @@ -46,10 +48,11 @@ relations: - nova-cloud-controller:placement applications: rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.8/edge percona-cluster: - charm: cs:~openstack-charmers/percona-cluster + charm: ch:percona-cluster num_units: 1 options: max-connections: 1000 @@ -57,8 +60,9 @@ applications: dataset-size: 25% root-password: ChangeMe123 sst-password: ChangeMe123 + channel: 5.7/edge nova-cloud-controller: - charm: ../../../nova-cloud-controller + charm: ../../nova-cloud-controller.charm num_units: 1 options: openstack-origin: cloud:bionic-ussuri @@ -68,7 +72,7 @@ applications: vendor-data-url: http://some.url/vdata debug: true neutron-api: - charm: cs:~openstack-charmers/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -76,31 +80,37 @@ applications: openstack-origin: cloud:bionic-ussuri flat-network-providers: physnet1 neutron-security-groups: true + channel: ussuri/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri + channel: ussuri/edge neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: cloud:bionic-ussuri bridge-mappings: physnet1:br-ex + channel: ussuri/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri + channel: ussuri/edge neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: ussuri/edge placement: - charm: cs:~openstack-charmers/placement + charm: ch:placement num_units: 1 options: openstack-origin: cloud:bionic-ussuri + channel: ussuri/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 2 constraints: mem=4G cores=4 options: @@ -111,3 +121,4 @@ applications: ephemeral-device: /dev/vdb ephemeral-unmount: /mnt debug: true + channel: ussuri/edge diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 854a6a4a..7ee5db03 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -1,3 +1,5 @@ +local_overlay_enabled: False + variables: openstack-origin: &openstack-origin distro @@ -30,20 +32,26 @@ machines: applications: nova-cloud-controller-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 glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router + charm: ch:mysql-router + channel: 8.0/edge neutron-api-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 vault-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 @@ -53,15 +61,17 @@ applications: - '0' - '1' - '2' + channel: 8.0/edge rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '3' + channel: 3.8/edge nova-cloud-controller: - charm: ../../../nova-cloud-controller + charm: ../../nova-cloud-controller.charm num_units: 1 options: openstack-origin: *openstack-origin @@ -74,7 +84,7 @@ applications: - '4' neutron-api: - charm: cs:~openstack-charmers/neutron-api + charm: ch:neutron-api num_units: 1 options: manage-neutron-plugin-legacy-mode: true @@ -84,45 +94,51 @@ applications: neutron-security-groups: true to: - '5' + channel: ussuri/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '6' + channel: ussuri/edge neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway + charm: ch:neutron-gateway num_units: 1 options: openstack-origin: *openstack-origin bridge-mappings: physnet1:br-ex to: - '7' + channel: ussuri/edge glance: - charm: cs:~openstack-charmers/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '8' + channel: ussuri/edge neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch + charm: ch:neutron-openvswitch + channel: ussuri/edge placement: - charm: cs:~openstack-charmers/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin to: - '9' + channel: ussuri/edge nova-compute: - charm: cs:~openstack-charmers/nova-compute + charm: ch:nova-compute num_units: 2 storage: ephemeral-device: '40G' @@ -135,12 +151,14 @@ applications: to: - '10' - '11' + channel: ussuri/edge vault: - charm: cs:~openstack-charmers/vault + charm: ch:vault num_units: 1 to: - '12' + channel: 1.7/edge relations: diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml deleted file mode 100644 index a18339f1..00000000 --- a/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,241 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - '9': - # machines 10 and 11 are for nova-compute which needs more memory for the - # instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault-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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '3' - - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '10' - - '11' - - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 30fcaeb4..00000000 --- a/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,241 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - '9': - # machines 10 and 11 are for nova-compute which needs more memory for the - # instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault-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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '3' - - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '10' - - '11' - - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml deleted file mode 100644 index 14682a74..00000000 --- a/tests/bundles/focal-xena.yaml +++ /dev/null @@ -1,241 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-xena - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - '9': - # machines 10 and 11 are for nova-compute which needs more memory for the - # instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault-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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '3' - - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '10' - - '11' - - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml deleted file mode 100644 index 10208f14..00000000 --- a/tests/bundles/groovy-victoria.yaml +++ /dev/null @@ -1,241 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: groovy - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - '9': - # machines 10 and 11 are for nova-compute which needs more memory for the - # instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault-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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '3' - - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '10' - - '11' - - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index e5137e50..00000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,241 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - '9': - # machines 10 and 11 are for nova-compute which needs more memory for the - # instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault-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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '3' - - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '10' - - '11' - - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml deleted file mode 100644 index 6869b271..00000000 --- a/tests/bundles/impish-xena.yaml +++ /dev/null @@ -1,241 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: impish - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - '7': - '8': - '9': - # machines 10 and 11 are for nova-compute which needs more memory for the - # instances. - '10': - constraints: mem=4096M cores=4 - '11': - constraints: mem=4096M cores=4 - '12': - -applications: - - nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers/mysql-router - neutron-api-mysql-router: - charm: cs:~openstack-charmers/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers/mysql-router - vault-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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - to: - - '3' - - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: *openstack-origin - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - to: - - '4' - - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - manage-neutron-plugin-legacy-mode: true - neutron-plugin: ovs - openstack-origin: *openstack-origin - flat-network-providers: physnet1 - neutron-security-groups: true - to: - - '5' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '6' - - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: *openstack-origin - bridge-mappings: physnet1:br-ex - to: - - '7' - - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '8' - - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - - placement: - charm: cs:~openstack-charmers/placement - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '9' - - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - storage: - ephemeral-device: '40G' - options: - openstack-origin: *openstack-origin - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - debug: true - to: - - '10' - - '11' - - vault: - charm: cs:~openstack-charmers/vault - num_units: 1 - to: - - '12' - -relations: - - - - 'nova-compute:image-service' - - 'glance:image-service' - - - - 'nova-compute:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:shared-db' - - 'nova-cloud-controller-mysql-router:shared-db' - - - 'nova-cloud-controller-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'nova-cloud-controller:identity-service' - - 'keystone:identity-service' - - - - 'nova-cloud-controller:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:cloud-compute' - - 'nova-compute:cloud-compute' - - - - 'nova-cloud-controller:image-service' - - 'glance:image-service' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-gateway:amqp' - - 'rabbitmq-server:amqp' - - - - 'nova-cloud-controller:quantum-network-service' - - 'neutron-gateway:quantum-network-service' - - - - 'neutron-api:shared-db' - - 'neutron-api-mysql-router:shared-db' - - - 'neutron-api-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'neutron-api:amqp' - - 'rabbitmq-server:amqp' - - - - 'neutron-api:neutron-api' - - 'nova-cloud-controller:neutron-api' - - - - 'neutron-api:identity-service' - - 'keystone:identity-service' - - - - 'nova-compute:neutron-plugin' - - 'neutron-openvswitch:neutron-plugin' - - - - 'rabbitmq-server:amqp' - - 'neutron-openvswitch:amqp' - - - - 'placement:shared-db' - - 'placement-mysql-router:shared-db' - - - 'placement-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'placement:identity-service' - - 'keystone:identity-service' - - - - 'placement:placement' - - 'nova-cloud-controller:placement' - - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'vault:certificates' - - 'neutron-api:certificates' - - - - 'vault:certificates' - - 'glance:certificates' - - - - 'vault:certificates' - - 'keystone:certificates' - - - - 'vault:certificates' - - 'nova-cloud-controller:certificates' - - - - 'vault:certificates' - - 'placement:certificates' diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml deleted file mode 100644 index 8e32bb19..00000000 --- a/tests/bundles/xenial-mitaka.yaml +++ /dev/null @@ -1,90 +0,0 @@ -series: xenial -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -applications: - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - dataset-size: 25% - root-password: ChangeMe123 - sst-password: ChangeMe123 - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - debug: true - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - constraints: mem=4G cores=4 - options: - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml deleted file mode 100644 index 7ecad271..00000000 --- a/tests/bundles/xenial-ocata.yaml +++ /dev/null @@ -1,100 +0,0 @@ -series: xenial -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -applications: - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - dataset-size: 25% - root-password: ChangeMe123 - sst-password: ChangeMe123 - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:xenial-ocata - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - constraints: mem=4G cores=4 - options: - openstack-origin: cloud:xenial-ocata - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml deleted file mode 100644 index c2b3c109..00000000 --- a/tests/bundles/xenial-pike.yaml +++ /dev/null @@ -1,100 +0,0 @@ -series: xenial -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -applications: - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - dataset-size: 25% - root-password: ChangeMe123 - sst-password: ChangeMe123 - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:xenial-pike - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - constraints: mem=4G cores=4 - options: - openstack-origin: cloud:xenial-pike - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml deleted file mode 100644 index 7881a701..00000000 --- a/tests/bundles/xenial-queens.yaml +++ /dev/null @@ -1,100 +0,0 @@ -series: xenial -relations: -- - nova-compute:image-service - - glance:image-service -- - nova-compute:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:shared-db - - percona-cluster:shared-db -- - nova-cloud-controller:identity-service - - keystone:identity-service -- - nova-cloud-controller:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute -- - nova-cloud-controller:image-service - - glance:image-service -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - glance:shared-db - - percona-cluster:shared-db -- - glance:amqp - - rabbitmq-server:amqp -- - neutron-gateway:amqp - - rabbitmq-server:amqp -- - nova-cloud-controller:quantum-network-service - - neutron-gateway:quantum-network-service -- - neutron-api:shared-db - - percona-cluster:shared-db -- - neutron-api:amqp - - rabbitmq-server:amqp -- - neutron-api:neutron-api - - nova-cloud-controller:neutron-api -- - neutron-api:identity-service - - keystone:identity-service -- - nova-compute:neutron-plugin - - neutron-openvswitch:neutron-plugin -- - rabbitmq-server:amqp - - neutron-openvswitch:amqp -applications: - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - max-connections: 1000 - innodb-buffer-pool-size: 256M - dataset-size: 25% - root-password: ChangeMe123 - sst-password: ChangeMe123 - nova-cloud-controller: - charm: ../../../nova-cloud-controller - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );" - network-manager: Neutron - vendor-data: '{"some": "json data"}' - vendor-data-url: http://some.url/vdata - debug: true - neutron-api: - charm: cs:~openstack-charmers/neutron-api - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - flat-network-providers: physnet1 - neutron-security-groups: true - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - neutron-gateway: - charm: cs:~openstack-charmers/neutron-gateway - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - bridge-mappings: physnet1:br-ex - glance: - charm: cs:~openstack-charmers/glance - num_units: 1 - options: - openstack-origin: cloud:xenial-queens - neutron-openvswitch: - charm: cs:~openstack-charmers/neutron-openvswitch - nova-compute: - charm: cs:~openstack-charmers/nova-compute - num_units: 2 - constraints: mem=4G cores=4 - options: - openstack-origin: cloud:xenial-queens - config-flags: auto_assign_floating_ip=False - enable-live-migration: false - aa-profile-mode: enforce - ephemeral-device: /dev/vdb - ephemeral-unmount: /mnt - debug: true diff --git a/tests/tests.yaml b/tests/tests.yaml index 25652907..021cb7f8 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -4,24 +4,11 @@ smoke_bundles: - vault: focal-ussuri gate_bundles: -- vault: groovy-victoria -- vault: focal-wallaby -- vault: focal-victoria - vault: focal-ussuri - sync_az: bionic-ussuri - sync_az: bionic-train -- sync_az: bionic-stein -- bionic-queens -- xenial-mitaka -dev_bundles: -- xenial-ocata -- xenial-pike -- xenial-queens -- bionic-rocky -- focal-xena -- vault: hirsute-wallaby -- vault: impish-xena +dev_bundles: [] target_deploy_status: vault: @@ -64,6 +51,4 @@ tests: - zaza.openstack.charm_tests.nova.tests.NovaCloudControllerActionTest tests_options: - force_deploy: - - groovy-victoria - - impish-xena + force_deploy: [] diff --git a/tox.ini b/tox.ini index ba4fd5b6..d99d7183 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,31 @@ deps = -r{toxinidir}/requirements.txt basepython = python3.6 deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} [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