From 39be2957f78f8ad9ecec8eeed5bdc824d9871a91 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 23 Sep 2021 10:41:47 +0100 Subject: [PATCH] Add xena bundles - add non-voting focal-xena bundle - add non-voting impish-xena bundle - drop groovy-victoria bundle - rebuild to pick up charm-helpers changes - update tox/pip.sh to ensure setuptools<50.0.0 Change-Id: I2b8492b39c0f16d3b8646f4eb2b2211ec9f576a1 --- osci.yaml | 6 + pip.sh | 18 +++ rebuild | 2 +- src/tests/bundles/focal-xena.yaml | 132 ++++++++++++++++++ ...{groovy-victoria.yaml => impish-xena.yaml} | 2 +- src/tests/tests.yaml | 9 +- src/tox.ini | 4 +- tox.ini | 17 ++- 8 files changed, 181 insertions(+), 9 deletions(-) create mode 100755 pip.sh create mode 100644 src/tests/bundles/focal-xena.yaml rename src/tests/bundles/{groovy-victoria.yaml => impish-xena.yaml} (99%) diff --git a/osci.yaml b/osci.yaml index 63c0e27..0e09f91 100644 --- a/osci.yaml +++ b/osci.yaml @@ -2,6 +2,12 @@ templates: - charm-unit-jobs - charm-functional-jobs + check: + jobs: + - focal-xena: + voting: false + - impish-xena: + voting: false vars: needs_charm_build: true charm_build_name: designate diff --git a/pip.sh b/pip.sh new file mode 100755 index 0000000..9a7e6b0 --- /dev/null +++ b/pip.sh @@ -0,0 +1,18 @@ +#!/usr/bin/env bash +# +# This file is managed centrally by release-tools and should not be modified +# within individual charm repos. See the 'global' dir contents for available +# choices of tox.ini for OpenStack Charms: +# https://github.com/openstack-charmers/release-tools +# +# setuptools 58.0 dropped the support for use_2to3=true which is needed to +# install blessings (an indirect dependency of charm-tools). +# +# More details on the beahvior of tox and virtualenv creation can be found at +# https://github.com/tox-dev/tox/issues/448 +# +# This script is wrapper to force the use of the pinned versions early in the +# process when the virtualenv was created and upgraded before installing the +# depedencies declared in the target. +pip install 'pip<20.3' 'setuptools<50.0.0' +pip "$@" diff --git a/rebuild b/rebuild index b765ec0..8802e18 100644 --- a/rebuild +++ b/rebuild @@ -2,4 +2,4 @@ # when dependencies of the charm change, # but nothing in the charm needs to. # simply change the uuid to something new -f9e3df7e-b3eb-11eb-b248-6f12f59ca343 +53b9d6fe-1178-11ec-b441-e3334d9920e6 diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml new file mode 100644 index 0000000..8060df7 --- /dev/null +++ b/src/tests/bundles/focal-xena.yaml @@ -0,0 +1,132 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-xena + +series: focal + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + series: bionic + '8': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + designate-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-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' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + manage-neutron-plugin-legacy-mode: true + openstack-origin: *openstack-origin + to: + - '5' + + designate-bind: + charm: cs:~openstack-charmers-next/designate-bind + num_units: 1 + # NOTE(ajkavanagh) apparently it has no openstack origin! + #options: + #openstack-origin: *openstack-origin + to: + - '6' + + memcached: + charm: cs:~memcached-team/memcached + num_units: 1 + # holding charm at bionic as it isn't available for focal+ yet + series: bionic + to: + - '7' + + designate: + charm: ../../../designate + num_units: 1 + options: + nameservers: 'ns1.amuletexample.com. ns2.amuletexample.com.' + openstack-origin: *openstack-origin + to: + - '8' + + nrpe: + charm: cs:nrpe + +relations: + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'designate:shared-db' + - 'designate-mysql-router:shared-db' + - - 'designate-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'designate:amqp' + - 'rabbitmq-server:amqp' + + - - 'designate:identity-service' + - 'keystone:identity-service' + + - - 'designate:dns-backend' + - 'designate-bind:dns-backend' + + - - 'designate:coordinator-memcached' + - 'memcached:cache' + + - - 'designate:dnsaas' + - 'neutron-api:external-dns' + + - - 'neutron-api:identity-service' + - 'keystone:identity-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' + + - - 'designate:nrpe-external-master' + - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/impish-xena.yaml similarity index 99% rename from src/tests/bundles/groovy-victoria.yaml rename to src/tests/bundles/impish-xena.yaml index 15dc28c..e72390a 100644 --- a/src/tests/bundles/groovy-victoria.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -1,7 +1,7 @@ variables: openstack-origin: &openstack-origin distro -series: groovy +series: impish machines: '0': diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 8311d4a..5dcde9d 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -7,12 +7,10 @@ gate_bundles: - xenial-mitaka - bionic-queens - bionic-stein - - bionic-train - bionic-ussuri - focal-ussuri - - focal-victoria - focal-wallaby - - groovy-victoria + - focal-xena dev_bundles: - trusty-mitaka @@ -20,7 +18,10 @@ dev_bundles: - xenial-pike - xenial-queens - bionic-rocky + - bionic-train + - focal-victoria - hirsute-wallaby + - impish-xena tests: - zaza.openstack.charm_tests.designate.tests.DesignateTests @@ -34,5 +35,5 @@ tests_options: force_deploy: # NOTE(lourot): this is needed because the NRPE charm isn't available on # non-LTS Ubuntu series. See lp:1933643 - - groovy-victoria - hirsute-wallaby + - impish-xena diff --git a/src/tox.ini b/src/tox.ini index e763047..b40d295 100644 --- a/src/tox.ini +++ b/src/tox.ini @@ -22,12 +22,12 @@ skip_missing_interpreters = False requires = pip < 20.3 virtualenv < 20.0 # NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci -minversion = 3.2.0 +minversion = 3.18.0 [testenv] setenv = VIRTUAL_ENV={envdir} PYTHONHASHSEED=0 -whitelist_externals = juju +allowlist_externals = juju passenv = HOME TERM CS_* OS_* TEST_* deps = -r{toxinidir}/test-requirements.txt install_command = diff --git a/tox.ini b/tox.ini index 5c81801..22159df 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,21 @@ envlist = pep8,py3 sitepackages = False # NOTE: Avoid false positives by not skipping missing interpreters. skip_missing_interpreters = False +# NOTES: +# * We avoid the new dependency resolver by pinning pip < 20.3, see +# https://github.com/pypa/pip/issues/9187 +# * Pinning dependencies requires tox >= 3.2.0, see +# https://tox.readthedocs.io/en/latest/config.html#conf-requires +# * It is also necessary to pin virtualenv as a newer virtualenv would still +# lead to fetching the latest pip in the func* tox targets, see +# https://stackoverflow.com/a/38133283 +requires = + pip < 20.3 + virtualenv < 20.0 + setuptools<50.0.0 + +# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci +minversion = 3.18.0 [testenv] setenv = VIRTUAL_ENV={envdir} @@ -21,7 +36,7 @@ setenv = VIRTUAL_ENV={envdir} JUJU_REPOSITORY={toxinidir}/build passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY install_command = - pip install {opts} {packages} + {toxinidir}/pip.sh install {opts} {packages} deps = -r{toxinidir}/requirements.txt