From 3ac1472fe6d79e2c756d37367a5138f90cea8b87 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 9 Sep 2021 15:44:42 +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: Icbc9877edc720792f9bb09d8b246d38748b5f5ba --- osci.yaml | 4 ++ pip.sh | 18 ++++++++ rebuild | 2 +- src/tests/bundles/focal-xena.yaml | 74 ++++++++++++++++++++++++++++++ src/tests/bundles/impish-xena.yaml | 74 ++++++++++++++++++++++++++++++ src/tests/tests.yaml | 4 ++ src/tox.ini | 4 +- tox.ini | 17 ++++++- 8 files changed, 193 insertions(+), 4 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 4047b3f..8a73554 100644 --- a/osci.yaml +++ b/osci.yaml @@ -6,8 +6,12 @@ # - charm-functional-jobs check: jobs: + - impish-xena: + voting: false - hirsute-wallaby - groovy-victoria + - focal-xena: + voting: false - focal-wallaby - focal-victoria - focal-ussuri 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 0873c03..3ed3821 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 -f9b70d46-b3eb-11eb-a72e-379d965894fc +53a3cc06-1178-11ec-a0a4-d3f9c5859dca diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml new file mode 100644 index 0000000..a3aca08 --- /dev/null +++ b/src/tests/bundles/focal-xena.yaml @@ -0,0 +1,74 @@ +variables: + openstack-origin: &openstack-origin cloud:focal-xena + +series: &series focal + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + barbican-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' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '3' + + barbican: + series: *series + charm: ../../../barbican + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: true + to: + - '4' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + to: + - '5' + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'barbican:shared-db' + - 'barbican-mysql-router:shared-db' + - - 'barbican-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'keystone:identity-service' + - 'barbican:identity-service' + + - - 'rabbitmq-server:amqp' + - 'barbican:amqp' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml new file mode 100644 index 0000000..28b931e --- /dev/null +++ b/src/tests/bundles/impish-xena.yaml @@ -0,0 +1,74 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series impish + +machines: + '0': + constraints: mem=3072M + '1': + constraints: mem=3072M + '2': + constraints: mem=3072M + '3': + '4': + '5': + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + barbican-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' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + to: + - '3' + + barbican: + series: *series + charm: ../../../barbican + num_units: 1 + options: + openstack-origin: *openstack-origin + debug: true + to: + - '4' + + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + to: + - '5' + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'barbican:shared-db' + - 'barbican-mysql-router:shared-db' + - - 'barbican-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'keystone:identity-service' + - 'barbican:identity-service' + + - - 'rabbitmq-server:amqp' + - 'barbican:amqp' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 4ebd504..a4e9009 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -2,7 +2,9 @@ charm_name: barbican smoke_bundles: - focal-ussuri gate_bundles: +- impish-xena - groovy-victoria +- focal-xena - focal-wallaby - focal-victoria - focal-ussuri @@ -17,3 +19,5 @@ tests: tests_options: force_deploy: - hirsute-wallaby + - groovy-victoria + - 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