From 1c35d6287ab8efd11ab43f216e7f4878bf7e3e3c Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 27 Sep 2021 19:59:17 +0100 Subject: [PATCH] Add xena bundles - add non-voting focal-xena bundle - add non-voting impish-xena bundle - rebuild to pick up charm-helpers changes - update tox/pip.sh to ensure setuptools<50.0.0 Change-Id: Ic8780e9b5fea8a541fea4ddfcd7b07e0306df4c7 Co-authored-by: Aurelien Lourot --- osci.yaml | 4 ++ pip.sh | 18 +++++++ rebuild | 2 +- src/tests/bundles/focal-xena.yaml | 78 +++++++++++++++++++++++++++++ src/tests/bundles/impish-xena.yaml | 79 ++++++++++++++++++++++++++++++ src/tests/tests.yaml | 7 ++- src/tox.ini | 4 +- tox.ini | 17 ++++++- 8 files changed, 204 insertions(+), 5 deletions(-) create mode 100755 pip.sh create mode 100644 src/tests/bundles/focal-xena.yaml create mode 100644 src/tests/bundles/impish-xena.yaml diff --git a/osci.yaml b/osci.yaml index 7332d70..72ad892 100644 --- a/osci.yaml +++ b/osci.yaml @@ -8,8 +8,12 @@ - focal-ussuri - focal-victoria - focal-wallaby + - focal-xena: + voting: false - groovy-victoria - hirsute-wallaby + - impish-xena: + voting: false vars: needs_charm_build: true charm_build_name: ovn-dedicated-chassis 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 9874f1c..667d107 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 -445369d3-d575-4fb0-8524-c82cab1188de +53efa2fc-1178-11ec-9278-e70cf6a26357 diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml new file mode 100644 index 0000000..315812f --- /dev/null +++ b/src/tests/bundles/focal-xena.yaml @@ -0,0 +1,78 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-xena + +series: focal + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + +applications: + + 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' + + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + to: + - '3' + + ovn-central: + charm: cs:~openstack-charmers-next/ovn-central + num_units: 3 + options: + source: *openstack-origin + to: + - '4' + - '5' + - '6' + + nrpe: + charm: cs:nrpe + + ovn-dedicated-chassis: + charm: cs:~openstack-charmers-next/ovn-dedicated-chassis + num_units: 2 + options: + source: *openstack-origin + to: + - '7' + - '8' + +relations: + + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'ovn-central:certificates' + - 'vault:certificates' + - - 'ovn-dedicated-chassis:ovsdb' + - 'ovn-central:ovsdb' + - - 'ovn-dedicated-chassis:certificates' + - 'vault:certificates' + - - 'ovn-dedicated-chassis:nrpe-external-master' + - 'nrpe:nrpe-external-master' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml new file mode 100644 index 0000000..941cfed --- /dev/null +++ b/src/tests/bundles/impish-xena.yaml @@ -0,0 +1,79 @@ +variables: + openstack-origin: &openstack-origin distro + +series: impish + +comment: +- 'machines section to decide order of deployment. database sooner = faster' +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + '6': + '7': + '8': + +applications: + + 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' + + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + to: + - '3' + + nrpe: + charm: cs:nrpe + + ovn-central: + charm: cs:~openstack-charmers-next/ovn-central + num_units: 3 + options: + source: *openstack-origin + to: + - '4' + - '5' + - '6' + + ovn-dedicated-chassis: + charm: ../../../ovn-dedicated-chassis + num_units: 2 + options: + source: *openstack-origin + to: + - '7' + - '8' + + +relations: + + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'ovn-central:certificates' + - 'vault:certificates' + - - 'ovn-dedicated-chassis:ovsdb' + - 'ovn-central:ovsdb' + - - 'ovn-dedicated-chassis:certificates' + - 'vault:certificates' + - - 'ovn-dedicated-chassis:nrpe-external-master' + - 'nrpe:nrpe-external-master' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 2a7bd72..a929b6b 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -12,6 +12,10 @@ gate_bundles: smoke_bundles: - focal-ussuri +dev_bundles: +- focal-xena +- impish-xena + target_deploy_status: ovn-central: workload-status: waiting @@ -36,4 +40,5 @@ tests: tests_options: force_deploy: - groovy-victoria # workaround for lp:1933643 - - hirsute-wallaby + - hirsute-wallaby # because of nrpe charm not supporting hirsute + - 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