From c960f2d024fd129cf8ee5716c9a3fa824cabfb3a 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 * pin pyparsing for aodhclient * pin cffi for py35 * add non-voting focal-yoga bundle * add non-voting jammy-yoga bundle * add series metadata for jammy * switch xena bundles to voting * run focal-ussuri as smoke tests * remove trusty, xenial, and groovy metadata and tests Change-Id: Ibb22cd736e8b500de9cab0905e389c1d9669cc62 --- osci.yaml | 14 +- requirements.txt | 1 + src/tests/bundles/groovy-full-ha.yaml | 1 - .../{groovy-full.yaml => jammy-full-ha.yaml} | 6 +- src/tests/bundles/jammy-full.yaml | 161 ++++++++++++++++++ src/tests/bundles/{groovy.yaml => jammy.yaml} | 3 +- ...-full-ha.yaml.j2 => jammy-full-ha.yaml.j2} | 0 src/tests/tests.yaml | 24 +-- test-requirements.txt | 2 + 9 files changed, 189 insertions(+), 23 deletions(-) delete mode 120000 src/tests/bundles/groovy-full-ha.yaml rename src/tests/bundles/{groovy-full.yaml => jammy-full-ha.yaml} (98%) create mode 100644 src/tests/bundles/jammy-full.yaml rename src/tests/bundles/{groovy.yaml => jammy.yaml} (95%) rename src/tests/bundles/overlays/{groovy-full-ha.yaml.j2 => jammy-full-ha.yaml.j2} (100%) diff --git a/osci.yaml b/osci.yaml index 4baf0ed..067de82 100644 --- a/osci.yaml +++ b/osci.yaml @@ -8,6 +8,8 @@ - full_model-hirsute-full-ha - full_model-impish-full-ha: voting: false + - full_model-jammy-full-ha: + voting: false vars: needs_charm_build: true charm_build_name: mysql-innodb-cluster @@ -19,12 +21,6 @@ - focal vars: tox_extra_args: full_model:focal-full-ha -- job: - name: full_model-groovy-full-ha - parent: func-target - dependencies: *smoke-jobs - vars: - tox_extra_args: full_model:groovy-full-ha - job: name: full_model-hirsute-full-ha parent: func-target @@ -37,3 +33,9 @@ dependencies: *smoke-jobs vars: tox_extra_args: full_model:impish-full-ha +- job: + name: full_model-jammy-full-ha + parent: func-target + dependencies: *smoke-jobs + vars: + tox_extra_args: full_model:jammy-full-ha diff --git a/requirements.txt b/requirements.txt index b786b42..a68620f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,6 +9,7 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 # Build requirements +cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. charm-tools==2.8.3 simplejson diff --git a/src/tests/bundles/groovy-full-ha.yaml b/src/tests/bundles/groovy-full-ha.yaml deleted file mode 120000 index 4245b47..0000000 --- a/src/tests/bundles/groovy-full-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -groovy-full.yaml \ No newline at end of file diff --git a/src/tests/bundles/groovy-full.yaml b/src/tests/bundles/jammy-full-ha.yaml similarity index 98% rename from src/tests/bundles/groovy-full.yaml rename to src/tests/bundles/jammy-full-ha.yaml index 9905cfe..9abddde 100644 --- a/src/tests/bundles/groovy-full.yaml +++ b/src/tests/bundles/jammy-full-ha.yaml @@ -1,7 +1,7 @@ variables: - openstack-origin: &openstack-origin distro-proposed + openstack-origin: &openstack-origin distro -series: &series groovy +series: &series jammy applications: keystone-mysql-router: @@ -79,7 +79,7 @@ applications: memcached: charm: cs:memcached num_units: 1 - series: bionic + series: focal relations: - - neutron-api:amqp - rabbitmq-server:amqp diff --git a/src/tests/bundles/jammy-full.yaml b/src/tests/bundles/jammy-full.yaml new file mode 100644 index 0000000..9abddde --- /dev/null +++ b/src/tests/bundles/jammy-full.yaml @@ -0,0 +1,161 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series jammy + +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: + charm: ../../../mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *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: cs:~openstack-charmers-next/neutron-api-plugin-ovn + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + series: *series + num_units: 1 + options: + flat-network-providers: physnet1 + neutron-security-groups: true + 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: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + 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 + memcached: + charm: cs:memcached + num_units: 1 + series: focal +relations: + - - 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 + - - vault:certificates + - mysql-innodb-cluster:certificates + - - memcached:cache + - nova-cloud-controller:memcache + - - 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.yaml b/src/tests/bundles/jammy.yaml similarity index 95% rename from src/tests/bundles/groovy.yaml rename to src/tests/bundles/jammy.yaml index 2241e53..02b7ac8 100644 --- a/src/tests/bundles/groovy.yaml +++ b/src/tests/bundles/jammy.yaml @@ -1,11 +1,10 @@ -series: groovy +series: jammy applications: keystone-mysql-router: charm: cs:~openstack-charmers-next/mysql-router vault-mysql-router: charm: cs:~openstack-charmers-next/mysql-router mysql-innodb-cluster: - series: groovy charm: ../../../mysql-innodb-cluster num_units: 3 keystone: diff --git a/src/tests/bundles/overlays/groovy-full-ha.yaml.j2 b/src/tests/bundles/overlays/jammy-full-ha.yaml.j2 similarity index 100% rename from src/tests/bundles/overlays/groovy-full-ha.yaml.j2 rename to src/tests/bundles/overlays/jammy-full-ha.yaml.j2 diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 4f176b5..50833b8 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -27,25 +27,27 @@ tests: gate_bundles: - scale_in_out: focal +- scale_in_out: hirsute +- scale_in_out: impish - full_model: focal-full-ha +- full_model: hirsute-full-ha +- full_model: impish-full-ha smoke_bundles: -- focal +- full_model: focal dev_bundles: -- scale_in_out: groovy -- full_model: groovy-full-ha -- scale_in_out: hirsute -- full_model: hirsute-full-ha -- scale_in_out: impish -- full_model: impish-full-ha +- scale_in_out: jammy +- full_model: jammy-full-ha tests_options: force_deploy: - - groovy - - groovy-full-ha - - impish - - impish-full-ha + - hirsute + - hirsute-full-ha + - impish + - impish-full-ha + - jammy + - jammy-full-ha target_deploy_status: neutron-api-plugin-ovn: diff --git a/test-requirements.txt b/test-requirements.txt index af069e1..bb1307f 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,6 +3,8 @@ # 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 stestr>=2.2.0