From 886c2ea713431aa159341e0efd41122a92c141dc Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 27 Jan 2022 15:29:27 +0000 Subject: [PATCH] Update to build using charmcraft Due to a build problem with the reactive plugin, this change falls back on overriding the steps and doing a manual build, but it also ensures the CI system builds the charm using charmcraft. Changes: - add a build-requirements.txt - modify charmcraft.yaml - modify osci.yaml -> indicate build with charmcraft - modify tox.ini -> tox -e build does charmcraft build/rename -> tox -e build-reactive does the reactive build - modify bundles to use the .charm artifact in tests. and fix deprecation warning re: prefix - tox inception to enable tox -e func-test in the CI Change-Id: Icad049b5d152306be943c9c7177bbf751b48ddb0 --- build-requirements.txt | 7 ++ charmcraft.yaml | 25 +++++ metadata.yaml | 1 + osci.yaml | 9 +- rename.sh | 13 +++ src/metadata.yaml | 3 - src/test-requirements.txt | 3 + src/tests/bundles/bionic-train.yaml | 136 ---------------------- src/tests/bundles/bionic-ussuri.yaml | 135 ---------------------- src/tests/bundles/focal-ussuri.yaml | 150 ------------------------- src/tests/bundles/focal-victoria.yaml | 150 ------------------------- src/tests/bundles/focal-wallaby.yaml | 150 ------------------------- src/tests/bundles/focal-xena.yaml | 58 ++++++---- src/tests/bundles/focal-yoga.yaml | 58 ++++++---- src/tests/bundles/hirsute-wallaby.yaml | 150 ------------------------- src/tests/bundles/impish-xena.yaml | 58 ++++++---- src/tests/bundles/jammy-yoga.yaml | 58 ++++++---- src/tests/tests.yaml | 17 +-- test-requirements.txt | 6 + tox.ini | 25 +++++ 20 files changed, 245 insertions(+), 967 deletions(-) create mode 100644 build-requirements.txt create mode 100644 charmcraft.yaml create mode 120000 metadata.yaml create mode 100755 rename.sh delete mode 100644 src/tests/bundles/bionic-train.yaml delete mode 100644 src/tests/bundles/bionic-ussuri.yaml delete mode 100644 src/tests/bundles/focal-ussuri.yaml delete mode 100644 src/tests/bundles/focal-victoria.yaml delete mode 100644 src/tests/bundles/focal-wallaby.yaml delete mode 100644 src/tests/bundles/hirsute-wallaby.yaml diff --git a/build-requirements.txt b/build-requirements.txt new file mode 100644 index 0000000..b6d2452 --- /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/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..4968216 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,25 @@ +type: charm + +parts: + charm: + build-packages: + - tox + - git + - python3-dev + override-build: | + apt-get install ca-certificates -y + tox -e build-reactive + override-stage: | + echo "Copying charm to staging area: $CHARMCRAFT_STAGE" + NAME=$(ls $CHARMCRAFT_PART_BUILD/build/builds) + cp -r $CHARMCRAFT_PART_BUILD/build/builds/$NAME/* $CHARMCRAFT_STAGE/ + override-prime: | + # For some reason, the normal priming chokes on the fact that there's a + # hooks directory. + cp -r $CHARMCRAFT_STAGE/* . + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml new file mode 120000 index 0000000..0768683 --- /dev/null +++ b/metadata.yaml @@ -0,0 +1 @@ +src/metadata.yaml \ No newline at end of file diff --git a/osci.yaml b/osci.yaml index 17d27d0..d46274b 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,11 +1,10 @@ - project: templates: - - charm-yoga-unit-jobs - - charm-yoga-functional-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 - charm-xena-functional-jobs - - charm-wallaby-functional-jobs - - charm-victoria-functional-jobs - - charm-ussuri-functional-jobs + - charm-yoga-functional-jobs vars: needs_charm_build: true charm_build_name: neutron-api-plugin-ovn + build_type: charmcraft diff --git a/rename.sh b/rename.sh new file mode 100755 index 0000000..d0c35c9 --- /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/src/metadata.yaml b/src/metadata.yaml index cf65e8d..dbd88fc 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -8,10 +8,7 @@ description: | tags: - networking series: -- bionic - focal -- groovy -- hirsute - impish subordinate: true requires: diff --git a/src/test-requirements.txt b/src/test-requirements.txt index e771023..9c7afb7 100644 --- a/src/test-requirements.txt +++ b/src/test-requirements.txt @@ -4,6 +4,9 @@ # https://github.com/openstack-charmers/release-tools # +# Need tox to be available from tox... inception yes, but its a workaround for now +tox + # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!) git+https://github.com/openstack-charmers/zaza.git#egg=zaza git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml deleted file mode 100644 index b7648b0..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,136 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-train - -series: &series bionic - -applications: - percona-cluster: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - ovn-central: - charm: cs:~openstack-charmers-next/ovn-central - num_units: 3 - options: - source: *openstack-origin - neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn - hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - series: *series - num_units: 3 - options: - manage-neutron-plugin-legacy-mode: false - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis - nova-compute: - constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin -relations: - - - hacluster-neutron-api:ha - - neutron-api:ha - - - 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 - - - keystone:shared-db - - percona-cluster:shared-db - - - nova-cloud-controller:shared-db - - percona-cluster:shared-db - - - nova-cloud-controller:amqp - - rabbitmq-server:amqp - - - nova-compute:amqp - - rabbitmq-server:amqp - - - 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 - - - placement:shared-db - - percona-cluster:shared-db - - - placement:identity-service - - keystone:identity-service - - - placement:placement - - nova-cloud-controller:placement - - - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate - - - vault:shared-db - - percona-cluster:shared-db - - - ovn-central:certificates - - vault:certificates - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - neutron-api:certificates - - vault:certificates - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:certificates - - glance:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - nova-cloud-controller:certificates - - - vault:certificates - - placement:certificates diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index c1ddea7..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,135 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:bionic-ussuri - -series: &series bionic - -applications: - percona-cluster: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - source: *openstack-origin - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - ovn-central: - charm: cs:~openstack-charmers-next/ovn-central - num_units: 3 - options: - source: *openstack-origin - neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn - hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - series: *series - num_units: 3 - options: - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis - nova-compute: - constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin -relations: - - - hacluster-neutron-api:ha - - neutron-api:ha - - - 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 - - - keystone:shared-db - - percona-cluster:shared-db - - - nova-cloud-controller:shared-db - - percona-cluster:shared-db - - - nova-cloud-controller:amqp - - rabbitmq-server:amqp - - - nova-compute:amqp - - rabbitmq-server:amqp - - - 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 - - - placement:shared-db - - percona-cluster:shared-db - - - placement:identity-service - - keystone:identity-service - - - placement:placement - - nova-cloud-controller:placement - - - neutron-api-plugin-ovn:neutron-plugin - - neutron-api:neutron-plugin-api-subordinate - - - vault:shared-db - - percona-cluster:shared-db - - - ovn-central:certificates - - vault:certificates - - - ovn-central:ovsdb-cms - - neutron-api-plugin-ovn:ovsdb-cms - - - neutron-api:certificates - - vault:certificates - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:certificates - - glance:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - nova-cloud-controller:certificates - - - vault:certificates - - placement:certificates diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 82b3c2e..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,150 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series focal - -applications: - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - mysql-innodb-cluster: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - ovn-central: - charm: cs:~openstack-charmers-next/ovn-central - num_units: 3 - options: - source: *openstack-origin - neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn - hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - series: *series - num_units: 3 - options: - # NOTE(fnordahl): At current state of upstream Neutron development this - # is a requirement. Remove once fixed upstream. - enable-ml2-port-security: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis - nova-compute: - constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin -relations: - - - hacluster-neutron-api:ha - - neutron-api:ha - - - neutron-api:amqp - - rabbitmq-server:amqp - - - neutron-api:neutron-api - - nova-cloud-controller:neutron-api - - - neutron-api:identity-service - - keystone:identity-service - - - nova-cloud-controller:amqp - - rabbitmq-server:amqp - - - nova-compute:amqp - - rabbitmq-server:amqp - - - nova-cloud-controller:identity-service - - keystone:identity-service - - - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute - - - glance:identity-service - - keystone:identity-service - - - glance:amqp - - rabbitmq-server:amqp - - - nova-compute:image-service - - glance:image-service - - - nova-cloud-controller:image-service - - glance:image-service - - - placement:identity-service - - keystone:identity-service - - - placement:placement - - nova-cloud-controller:placement - - - 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 - - - neutron-api:certificates - - vault:certificates - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:certificates - - glance:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - nova-cloud-controller:certificates - - - vault:certificates - - placement:certificates - - ["keystone:shared-db", "keystone-mysql-router:shared-db"] - - ["glance:shared-db", "glance-mysql-router:shared-db"] - - ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"] - - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"] - - ["placement:shared-db", "placement-mysql-router:shared-db"] - - ["vault:shared-db", "vault-mysql-router:shared-db"] - - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index c20a83b..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,150 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: &series focal - -applications: - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - mysql-innodb-cluster: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - ovn-central: - charm: cs:~openstack-charmers-next/ovn-central - num_units: 3 - options: - source: *openstack-origin - neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn - hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - series: *series - num_units: 3 - options: - # NOTE(fnordahl): At current state of upstream Neutron development this - # is a requirement. Remove once fixed upstream. - enable-ml2-port-security: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis - nova-compute: - constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin -relations: - - - hacluster-neutron-api:ha - - neutron-api:ha - - - neutron-api:amqp - - rabbitmq-server:amqp - - - neutron-api:neutron-api - - nova-cloud-controller:neutron-api - - - neutron-api:identity-service - - keystone:identity-service - - - nova-cloud-controller:amqp - - rabbitmq-server:amqp - - - nova-compute:amqp - - rabbitmq-server:amqp - - - nova-cloud-controller:identity-service - - keystone:identity-service - - - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute - - - glance:identity-service - - keystone:identity-service - - - glance:amqp - - rabbitmq-server:amqp - - - nova-compute:image-service - - glance:image-service - - - nova-cloud-controller:image-service - - glance:image-service - - - placement:identity-service - - keystone:identity-service - - - placement:placement - - nova-cloud-controller:placement - - - 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 - - - neutron-api:certificates - - vault:certificates - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:certificates - - glance:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - nova-cloud-controller:certificates - - - vault:certificates - - placement:certificates - - ["keystone:shared-db", "keystone-mysql-router:shared-db"] - - ["glance:shared-db", "glance-mysql-router:shared-db"] - - ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"] - - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"] - - ["placement:shared-db", "placement-mysql-router:shared-db"] - - ["vault:shared-db", "vault-mysql-router:shared-db"] - - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index da9ec35..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,150 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: &series focal - -applications: - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - mysql-innodb-cluster: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - ovn-central: - charm: cs:~openstack-charmers-next/ovn-central - num_units: 3 - options: - source: *openstack-origin - neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn - hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - series: *series - num_units: 3 - options: - # NOTE(fnordahl): At current state of upstream Neutron development this - # is a requirement. Remove once fixed upstream. - enable-ml2-port-security: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis - nova-compute: - constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin -relations: - - - hacluster-neutron-api:ha - - neutron-api:ha - - - neutron-api:amqp - - rabbitmq-server:amqp - - - neutron-api:neutron-api - - nova-cloud-controller:neutron-api - - - neutron-api:identity-service - - keystone:identity-service - - - nova-cloud-controller:amqp - - rabbitmq-server:amqp - - - nova-compute:amqp - - rabbitmq-server:amqp - - - nova-cloud-controller:identity-service - - keystone:identity-service - - - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute - - - glance:identity-service - - keystone:identity-service - - - glance:amqp - - rabbitmq-server:amqp - - - nova-compute:image-service - - glance:image-service - - - nova-cloud-controller:image-service - - glance:image-service - - - placement:identity-service - - keystone:identity-service - - - placement:placement - - nova-cloud-controller:placement - - - 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 - - - neutron-api:certificates - - vault:certificates - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:certificates - - glance:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - nova-cloud-controller:certificates - - - vault:certificates - - placement:certificates - - ["keystone:shared-db", "keystone-mysql-router:shared-db"] - - ["glance:shared-db", "glance-mysql-router:shared-db"] - - ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"] - - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"] - - ["placement:shared-db", "placement-mysql-router:shared-db"] - - ["vault:shared-db", "vault-mysql-router:shared-db"] - - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index 815b389..0d7f433 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -1,46 +1,59 @@ variables: openstack-origin: &openstack-origin cloud:focal-xena +local_overlay_enabled: False + series: &series focal applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: latest/edge ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin + channel: latest/edge neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn + charm: ../../../neutron-api-plugin-ovn.charm hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api series: *series num_units: 3 options: @@ -50,27 +63,32 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: latest/edge ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge nova-compute: constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: config-flags: default_ephemeral_format=ext4 @@ -78,11 +96,13 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge relations: - - hacluster-neutron-api:ha - neutron-api:ha diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index 21be409..405d57b 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -1,46 +1,59 @@ variables: openstack-origin: &openstack-origin cloud:focal-yoga +local_overlay_enabled: False + series: &series focal applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: latest/edge ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin + channel: latest/edge neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn + charm: ../../../neutron-api-plugin-ovn.charm hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api series: *series num_units: 3 options: @@ -50,27 +63,32 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: latest/edge ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge nova-compute: constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: config-flags: default_ephemeral_format=ext4 @@ -78,11 +96,13 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge relations: - - hacluster-neutron-api:ha - neutron-api:ha diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 80aa961..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,150 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &series hirsute - -applications: - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - mysql-innodb-cluster: - constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - ovn-central: - charm: cs:~openstack-charmers-next/ovn-central - num_units: 3 - options: - source: *openstack-origin - neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn - hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster - neutron-api: - charm: cs:~openstack-charmers-next/neutron-api - series: *series - num_units: 3 - options: - # NOTE(fnordahl): At current state of upstream Neutron development this - # is a requirement. Remove once fixed upstream. - enable-ml2-port-security: true - flat-network-providers: physnet1 - neutron-security-groups: true - openstack-origin: *openstack-origin - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - glance: - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller - num_units: 1 - options: - network-manager: Neutron - openstack-origin: *openstack-origin - ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis - nova-compute: - constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute - num_units: 2 - options: - config-flags: default_ephemeral_format=ext4 - enable-live-migration: true - enable-resize: true - migration-auth-type: ssh - openstack-origin: *openstack-origin - placement: - charm: cs:~openstack-charmers-next/placement - num_units: 1 - options: - openstack-origin: *openstack-origin -relations: - - - hacluster-neutron-api:ha - - neutron-api:ha - - - neutron-api:amqp - - rabbitmq-server:amqp - - - neutron-api:neutron-api - - nova-cloud-controller:neutron-api - - - neutron-api:identity-service - - keystone:identity-service - - - nova-cloud-controller:amqp - - rabbitmq-server:amqp - - - nova-compute:amqp - - rabbitmq-server:amqp - - - nova-cloud-controller:identity-service - - keystone:identity-service - - - nova-cloud-controller:cloud-compute - - nova-compute:cloud-compute - - - glance:identity-service - - keystone:identity-service - - - glance:amqp - - rabbitmq-server:amqp - - - nova-compute:image-service - - glance:image-service - - - nova-cloud-controller:image-service - - glance:image-service - - - placement:identity-service - - keystone:identity-service - - - placement:placement - - nova-cloud-controller:placement - - - 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 - - - neutron-api:certificates - - vault:certificates - - - ovn-chassis:nova-compute - - nova-compute:neutron-plugin - - - ovn-chassis:certificates - - vault:certificates - - - ovn-chassis:ovsdb - - ovn-central:ovsdb - - - vault:certificates - - neutron-api-plugin-ovn:certificates - - - vault:certificates - - glance:certificates - - - vault:certificates - - keystone:certificates - - - vault:certificates - - nova-cloud-controller:certificates - - - vault:certificates - - placement:certificates - - ["keystone:shared-db", "keystone-mysql-router:shared-db"] - - ["glance:shared-db", "glance-mysql-router:shared-db"] - - ["nova-cloud-controller:shared-db", "nova-mysql-router:shared-db"] - - ["neutron-api:shared-db", "neutron-mysql-router:shared-db"] - - ["placement:shared-db", "placement-mysql-router:shared-db"] - - ["vault:shared-db", "vault-mysql-router:shared-db"] - - ["keystone-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["nova-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["glance-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["neutron-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["placement-mysql-router:db-router", "mysql-innodb-cluster:db-router"] - - ["vault-mysql-router:db-router", "mysql-innodb-cluster:db-router"] diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index 9f9101d..32974bb 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -1,46 +1,59 @@ variables: openstack-origin: &openstack-origin distro +local_overlay_enabled: False + series: &series impish applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: latest/edge ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin + channel: latest/edge neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn + charm: ../../../neutron-api-plugin-ovn.charm hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api series: *series num_units: 3 options: @@ -50,27 +63,32 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: latest/edge ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge nova-compute: constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: config-flags: default_ephemeral_format=ext4 @@ -78,11 +96,13 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge relations: - - hacluster-neutron-api:ha - neutron-api:ha diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index 14d306a..d382762 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -1,46 +1,59 @@ variables: openstack-origin: &openstack-origin distro +local_overlay_enabled: False + series: &series jammy applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge nova-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge neutron-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge placement-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: constraints: mem=3072M - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin + channel: latest/edge rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *openstack-origin + channel: latest/edge vault: - charm: cs:~openstack-charmers-next/vault + charm: ch:vault num_units: 1 + channel: latest/edge ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: ch:ovn-central num_units: 3 options: source: *openstack-origin + channel: latest/edge neutron-api-plugin-ovn: - charm: ../../../neutron-api-plugin-ovn + charm: ../../../neutron-api-plugin-ovn.charm hacluster-neutron-api: - charm: cs:~openstack-charmers-next/hacluster + charm: ch:hacluster + channel: latest/edge neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: ch:neutron-api series: *series num_units: 3 options: @@ -50,27 +63,32 @@ applications: flat-network-providers: physnet1 neutron-security-groups: true openstack-origin: *openstack-origin + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge glance: - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: ch:nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin + channel: latest/edge ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: ch:ovn-chassis + channel: latest/edge nova-compute: constraints: "root-disk=20G mem=4G" - charm: cs:~openstack-charmers-next/nova-compute + charm: ch:nova-compute num_units: 2 options: config-flags: default_ephemeral_format=ext4 @@ -78,11 +96,13 @@ applications: enable-resize: true migration-auth-type: ssh openstack-origin: *openstack-origin + channel: latest/edge placement: - charm: cs:~openstack-charmers-next/placement + charm: ch:placement num_units: 1 options: openstack-origin: *openstack-origin + channel: latest/edge relations: - - hacluster-neutron-api:ha - neutron-api:ha diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index e0de818..b77c4a2 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,35 +1,29 @@ charm_name: neutron-api-plugin-ovn smoke_bundles: -- focal-ussuri +- focal-xena gate_bundles: -- bionic-ussuri -- focal-ussuri -- focal-victoria -- focal-wallaby - focal-xena -- hirsute-wallaby - impish-xena dev_bundles: -- bionic-train - focal-yoga - jammy-yoga target_deploy_status: neutron-api-plugin-ovn: workload-status: waiting - workload-status-message: "'certificates' awaiting server certificate data, 'ovsdb-cms' incomplete" + workload-status-message-prefix: "'certificates' awaiting server certificate data, 'ovsdb-cms' incomplete" ovn-central: workload-status: waiting - workload-status-message: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data" + workload-status-message-prefix: "'ovsdb-peer' incomplete, 'certificates' awaiting server certificate data" ovn-chassis: workload-status: waiting - workload-status-message: "'certificates' awaiting server certificate data" + workload-status-message-prefix: "'certificates' awaiting server certificate data" vault: workload-status: blocked - workload-status-message: Vault needs to be initialized + workload-status-message-prefix: Vault needs to be initialized configure: - zaza.openstack.charm_tests.vault.setup.auto_initialize @@ -43,6 +37,5 @@ tests: tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga diff --git a/test-requirements.txt b/test-requirements.txt index 208032f..a11a7d0 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -28,6 +28,11 @@ oslo.utils<=3.41.0;python_version<'3.6' requests>=2.18.4 charms.reactive +# Newer mock seems to have some syntax which is newer than python3.5 (e.g. +# f'{something}' +mock>=1.2,<4.0.0; python_version < '3.6' +mock>=1.2; python_version >= '3.6' + nose>=1.3.7 coverage>=3.6 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack @@ -46,3 +51,4 @@ pbr==5.6.0 # vault cryptography<3.4 # vault, keystone-saml-mellon lxml # keystone-saml-mellon hvac # vault, barbican-vault +psutil # cinder-lvm diff --git a/tox.ini b/tox.ini index faf6092..2d60b8a 100644 --- a/tox.ini +++ b/tox.ini @@ -37,11 +37,24 @@ setenv = VIRTUAL_ENV={envdir} passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY install_command = {toxinidir}/pip.sh install {opts} {packages} +allowlist_externals = + charmcraft + bash + tox + rename.sh deps = -r{toxinidir}/requirements.txt [testenv:build] basepython = python3 +deps = -r{toxinidir}/build-requirements.txt +commands = + charmcraft clean + charmcraft -v build + {toxinidir}/rename.sh + +[testenv:build-reactive] +basepython = python3 commands = charm-build --log-level DEBUG --use-lock-file-branches -o {toxinidir}/build/builds src {posargs} @@ -86,6 +99,18 @@ deps = flake8==3.9.2 charm-tools==2.8.3 commands = flake8 {posargs} src unit_tests +[testenv:func-target] +# Hack to get functional tests working in the charmcraft +# world. We should fix this. +basepython = python3 +passenv = HOME TERM CS_* OS_* TEST_* +deps = -r{toxinidir}/src/test-requirements.txt +changedir = {toxinidir}/src +commands = + bash -c "if [ ! -f ../*.charm ]; then echo 'Charm does not exist. Run tox -e build'; exit 1; fi" + tox --version + tox -e func-target {posargs} + [testenv:cover] # Technique based heavily upon # https://github.com/openstack/nova/blob/master/tox.ini