From dbd399354d2d3c3fb2a557de8b363d2a7fe61cd2 Mon Sep 17 00:00:00 2001 From: Corey Bryant Date: Fri, 29 Oct 2021 17:00:40 -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 groovy bundles Change-Id: Ic43f7c55f6b71ca8835d89629284de313290a62f --- osci.yaml | 22 ++- requirements.txt | 1 + src/metadata.yaml | 1 + src/tests/bundles/focal-yoga-s3.yaml | 145 ++++++++++++++++++ src/tests/bundles/focal-yoga.yaml | 144 +++++++++++++++++ ...vy-victoria-s3.yaml => jammy-yoga-s3.yaml} | 2 +- .../{groovy-victoria.yaml => jammy-yoga.yaml} | 2 +- src/tests/tests.yaml | 23 +-- test-requirements.txt | 2 + 9 files changed, 319 insertions(+), 23 deletions(-) create mode 100644 src/tests/bundles/focal-yoga-s3.yaml create mode 100644 src/tests/bundles/focal-yoga.yaml rename src/tests/bundles/{groovy-victoria-s3.yaml => jammy-yoga-s3.yaml} (99%) rename src/tests/bundles/{groovy-victoria.yaml => jammy-yoga.yaml} (99%) diff --git a/osci.yaml b/osci.yaml index 3c0d3b6..55205d0 100644 --- a/osci.yaml +++ b/osci.yaml @@ -10,24 +10,28 @@ - focal-ussuri - focal-victoria - focal-wallaby - - focal-xena: + - focal-xena + - focal-yoga: voting: false - - groovy-victoria - hirsute-wallaby - impish-xena: voting: false + - jammy-yoga: + voting: false - test-s3-bionic-stein-s3 - test-s3-bionic-train-s3 - test-s3-bionic-ussuri-s3 - test-s3-focal-ussuri-s3 - test-s3-focal-victoria-s3 - test-s3-focal-wallaby-s3 - - test-s3-focal-xena-s3: + - test-s3-focal-xena-s3 + - test-s3-focal-yoga-s3: voting: false - - test-s3-groovy-victoria-s3 - test-s3-hirsute-wallaby-s3 - test-s3-impish-xena-s3: voting: false + - test-s3-jammy-yoga-s3: + voting: false vars: needs_charm_build: true charm_build_name: gnocchi @@ -76,11 +80,11 @@ vars: tox_extra_args: test-s3:focal-xena-s3 - job: - name: test-s3-groovy-victoria-s3 + name: test-s3-focal-yoga-s3 parent: func-target dependencies: *smoke-jobs vars: - tox_extra_args: test-s3:groovy-victoria-s3 + tox_extra_args: test-s3:focal-yoga-s3 - job: name: test-s3-hirsute-wallaby-s3 parent: func-target @@ -93,3 +97,9 @@ dependencies: *smoke-jobs vars: tox_extra_args: test-s3:impish-xena-s3 +- job: + name: test-s3-jammy-yoga-s3 + parent: func-target + dependencies: *smoke-jobs + vars: + tox_extra_args: test-s3:jammy-yoga-s3 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/metadata.yaml b/src/metadata.yaml index fcb1278..a933b70 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -16,6 +16,7 @@ series: - groovy - hirsute - impish +- jammy provides: metric-service: interface: gnocchi diff --git a/src/tests/bundles/focal-yoga-s3.yaml b/src/tests/bundles/focal-yoga-s3.yaml new file mode 100644 index 0000000..e18d611 --- /dev/null +++ b/src/tests/bundles/focal-yoga-s3.yaml @@ -0,0 +1,145 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-yoga + +series: &series focal + +machines: + 0: + constraints: "mem=3072M" + 1: + constraints: "mem=3072M" + 2: + constraints: "mem=3072M" + 3: {} + 4: {} + 5: {} + 6: {} + 7: {} + 8: {} + 9: {} + 10: + series: bionic + +# We specify machine placements for these to improve iteration +# time, given that machine "0" comes up way before machine "6" +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + gnocchi-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '3' + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + ceilometer: + charm: cs:~openstack-charmers-next/ceilometer + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '5' + gnocchi: + series: *series + charm: ../../../gnocchi + num_units: 1 + options: + openstack-origin: *openstack-origin + storage-backend: s3 + to: + - '6' + memcached: + charm: cs:~memcached-team/memcached + num_units: 1 + # holding at bionic as memcached doesn't support focal yet + series: bionic + to: + - '10' + #swift-proxy is used to test gnocchi against an S3 storage backend + swift-proxy: + charm: swift-proxy + num_units: 1 + options: + zone-assignment: manual + replicas: 1 + swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae + openstack-origin: *openstack-origin + to: + - '7' + swift-storage: + charm: cs:~openstack-charmers-next/swift-storage + num_units: 1 + storage: + block-devices: 'cinder,10G' + options: + openstack-origin: *openstack-origin + zone: 1 + to: + - '8' + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + series: *series + to: + - '9' +relations: + - - keystone:shared-db + - keystone-mysql-router:shared-db + - - keystone-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - gnocchi:shared-db + - gnocchi-mysql-router:shared-db + - - gnocchi-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - ceilometer:amqp + - rabbitmq-server:amqp + - - ceilometer:identity-credentials + - keystone:identity-credentials + - - ceilometer:identity-notifications + - keystone:identity-notifications + - - ceilometer:metric-service + - gnocchi:metric-service + - - gnocchi:identity-service + - keystone:identity-service + - - gnocchi:coordinator-memcached + - memcached:cache + - - swift-proxy:identity-service + - keystone:identity-service + - - swift-storage:swift-storage + - swift-proxy:swift-storage + - - vault:shared-db + - vault-mysql-router:shared-db + - - vault-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - vault:certificates + - swift-proxy:certificates + - - vault:certificates + - gnocchi:certificates + - - vault:certificates + - ceilometer:certificates + - - vault:certificates + - keystone:certificates + - - vault:certificates + - rabbitmq-server:certificates diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml new file mode 100644 index 0000000..046e323 --- /dev/null +++ b/src/tests/bundles/focal-yoga.yaml @@ -0,0 +1,144 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-yoga + +series: &series focal + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + '9': + '10': + '11': + '12': + '13': + series: bionic + +# We specify machine placements for these to improve iteration +# time, given that machine "0" comes up way before machine "6" +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + gnocchi-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + + mysql-innodb-cluster: + charm: cs:~openstack-charmers-next/mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + to: + - '0' + - '1' + - '2' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + to: + - '3' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '4' + + ceilometer: + charm: cs:~openstack-charmers-next/ceilometer + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '5' + + ceph-osd: + charm: cs:~openstack-charmers-next/ceph-osd + num_units: 3 + storage: + osd-devices: 'cinder,10G' + options: + source: *openstack-origin + to: + - '6' + - '7' + - '8' + + ceph-mon: + charm: cs:~openstack-charmers-next/ceph-mon + num_units: 3 + options: + expected-osd-count: 3 + monitor-count: '3' + source: *openstack-origin + to: + - '9' + - '10' + - '11' + + gnocchi: + series: *series + charm: ../../../gnocchi + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '12' + + memcached: + charm: cs:~memcached-team/memcached + num_units: 1 + # holding at bionic as memcached doesn't support focal yet + series: bionic + to: + - '13' + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'ceph-osd:mon' + - 'ceph-mon:osd' + + - - 'ceilometer:amqp' + - 'rabbitmq-server:amqp' + + - - 'ceilometer:identity-credentials' + - 'keystone:identity-credentials' + + - - 'ceilometer:identity-notifications' + - 'keystone:identity-notifications' + + - - 'ceilometer:metric-service' + - 'gnocchi:metric-service' + + - - 'gnocchi:identity-service' + - 'keystone:identity-service' + + - - 'gnocchi:shared-db' + - 'gnocchi-mysql-router:shared-db' + - - 'gnocchi-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'gnocchi:storage-ceph' + - 'ceph-mon:client' + + - - 'gnocchi:coordinator-memcached' + - 'memcached:cache' diff --git a/src/tests/bundles/groovy-victoria-s3.yaml b/src/tests/bundles/jammy-yoga-s3.yaml similarity index 99% rename from src/tests/bundles/groovy-victoria-s3.yaml rename to src/tests/bundles/jammy-yoga-s3.yaml index 8606712..2475124 100644 --- a/src/tests/bundles/groovy-victoria-s3.yaml +++ b/src/tests/bundles/jammy-yoga-s3.yaml @@ -1,7 +1,7 @@ variables: openstack-origin: &openstack-origin distro -series: &series groovy +series: &series jammy machines: 0: 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 b6dcf80..b05d2ca 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 machines: '0': diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 27e1d4e..8c754a3 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -2,19 +2,14 @@ charm_name: gnocchi gate_bundles: - bionic-queens - - bionic-stein - - bionic-train - - bionic-ussuri - - focal-ussuri - - focal-wallaby - - focal-xena - test-s3: bionic-stein-s3 - - test-s3: bionic-train-s3 - test-s3: bionic-ussuri-s3 - test-s3: focal-ussuri-s3 + - test-s3: focal-victoria-s3 - test-s3: focal-wallaby-s3 - test-s3: focal-xena-s3 - - test-s3: groovy-victoria-s3 + - test-s3: hirsute-wallaby-s3 + - test-s3: impish-xena-s3 smoke_bundles: - focal-ussuri dev_bundles: @@ -22,11 +17,9 @@ dev_bundles: - xenial-pike - xenial-queens - bionic-rocky - - focal-victoria - - test-s3: focal-victoria-s3 - - groovy-victoria - - hirsute-wallaby - - test-s3: hirsute-wallaby-s3 + - test-s3: bionic-train-s3 + - test-s3: focal-yoga-s3 + - test-s3: jammy-yoga-s3 configure: - zaza.openstack.charm_tests.ceilometer.setup.basic_setup - test-s3: @@ -56,6 +49,6 @@ target_deploy_status: workload-status-message: Mandatory S3 configuration parameters missing. tests_options: force_deploy: - - groovy-victoria - - impish-xena + - hirsute-wallaby-s3 - impish-xena-s3 + - jammy-yoga-s3 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