From 240cc667a2bffc6b0518b61a7783145517e7bb90 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 29 Oct 2021 17:00:41 -0400 Subject: [PATCH] Add yoga bundles and release-tool syncs * charm-helpers sync for classic charms * sync from release-tools * switch to release-specific zosci functional tests * run focal-ussuri as smoke tests * remove trusty, xenial, and groovy metadata/tests * drop py35 and add py39 Change-Id: I94aced6559e0e354b8042b5728e4cb756082de1b --- osci.yaml | 21 +-- src/tests/bundles/focal-yoga.yaml | 150 ++++++++++++++++++ .../{groovy-victoria.yaml => jammy-yoga.yaml} | 2 +- ...vy-victoria.yaml.j2 => focal-yoga.yaml.j2} | 0 src/tests/bundles/overlays/jammy-yoga.yaml.j2 | 1 + src/tests/tests.yaml | 12 +- test-requirements.txt | 1 + tox.ini | 5 + 8 files changed, 171 insertions(+), 21 deletions(-) create mode 100644 src/tests/bundles/focal-yoga.yaml rename src/tests/bundles/{groovy-victoria.yaml => jammy-yoga.yaml} (99%) rename src/tests/bundles/overlays/{groovy-victoria.yaml.j2 => focal-yoga.yaml.j2} (100%) create mode 120000 src/tests/bundles/overlays/jammy-yoga.yaml.j2 diff --git a/osci.yaml b/osci.yaml index 47e3977..17d27d0 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,20 +1,11 @@ - project: templates: - - charm-unit-jobs - check: - jobs: - - charm-build - - bionic-train - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - - focal-xena: - voting: false - - groovy-victoria - - hirsute-wallaby - - impish-xena: - voting: false + - charm-yoga-unit-jobs + - charm-yoga-functional-jobs + - charm-xena-functional-jobs + - charm-wallaby-functional-jobs + - charm-victoria-functional-jobs + - charm-ussuri-functional-jobs vars: needs_charm_build: true charm_build_name: neutron-api-plugin-ovn diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml new file mode 100644 index 0000000..21be409 --- /dev/null +++ b/src/tests/bundles/focal-yoga.yaml @@ -0,0 +1,150 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-yoga + +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/groovy-victoria.yaml b/src/tests/bundles/jammy-yoga.yaml similarity index 99% rename from src/tests/bundles/groovy-victoria.yaml rename to src/tests/bundles/jammy-yoga.yaml index d4bfa10..14d306a 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -1,7 +1,7 @@ variables: openstack-origin: &openstack-origin distro -series: &series groovy +series: &series jammy applications: keystone-mysql-router: diff --git a/src/tests/bundles/overlays/groovy-victoria.yaml.j2 b/src/tests/bundles/overlays/focal-yoga.yaml.j2 similarity index 100% rename from src/tests/bundles/overlays/groovy-victoria.yaml.j2 rename to src/tests/bundles/overlays/focal-yoga.yaml.j2 diff --git a/src/tests/bundles/overlays/jammy-yoga.yaml.j2 b/src/tests/bundles/overlays/jammy-yoga.yaml.j2 new file mode 120000 index 0000000..b6c086c --- /dev/null +++ b/src/tests/bundles/overlays/jammy-yoga.yaml.j2 @@ -0,0 +1 @@ +ha.j2 \ No newline at end of file diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 1a3733f..e0de818 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -4,17 +4,18 @@ smoke_bundles: - focal-ussuri gate_bundles: -- bionic-train - bionic-ussuri - focal-ussuri - focal-victoria - focal-wallaby +- focal-xena - hirsute-wallaby +- impish-xena dev_bundles: -- focal-xena -- groovy-victoria -- impish-xena +- bionic-train +- focal-yoga +- jammy-yoga target_deploy_status: neutron-api-plugin-ovn: @@ -42,5 +43,6 @@ tests: tests_options: force_deploy: - - groovy-victoria + - hirsute-wallaby - impish-xena + - jammy-yoga diff --git a/test-requirements.txt b/test-requirements.txt index 3c01bf5..bb1307f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,6 +3,7 @@ # choices of *requirements.txt files for OpenStack Charms: # https://github.com/openstack-charmers/release-tools # +pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here. cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 diff --git a/tox.ini b/tox.ini index 22159df..faf6092 100644 --- a/tox.ini +++ b/tox.ini @@ -75,6 +75,11 @@ basepython = python3.8 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} +[testenv:py39] +basepython = python3.9 +deps = -r{toxinidir}/test-requirements.txt +commands = stestr run --slowest {posargs} + [testenv:pep8] basepython = python3 deps = flake8==3.9.2