From d7897237f558c012d47c3316bcdd01e73e821808 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 27 Sep 2021 20:04:36 +0100 Subject: [PATCH] Add xena bundles - add non-voting focal-xena bundle - add non-voting impish-xena bundle - remove groovy-victoria bundle - rebuild to pick up charm-helpers changes - update tox/pip.sh to ensure setuptools<50.0.0 Change-Id: I15112d21e7d79336cdaee84e0792cb0586dc9013 --- osci.yaml | 9 +- pip.sh | 18 ++ rebuild | 2 +- src/tests/bundles/focal-xena.yaml | 239 ++++++++++++++++++ ...{groovy-victoria.yaml => impish-xena.yaml} | 2 +- src/tests/tests.yaml | 5 +- src/tox.ini | 4 +- tox.ini | 17 +- 8 files changed, 286 insertions(+), 10 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 caf815c..207a9d0 100644 --- a/osci.yaml +++ b/osci.yaml @@ -8,9 +8,12 @@ - focal-ussuri - focal-victoria - focal-wallaby - - groovy-victoria - # disabled due to layer-basic issue; we'll get re-enabled shortly. - #- hirsute-wallaby + - focal-xena: + voting: false + - hirsute-wallaby: + voting: false + - impish-xena: + voting: false vars: needs_charm_build: true charm_build_name: placement 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 d072b26..487b08e 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 -fa53fdf4-b3eb-11eb-9a07-c3f88c787e14 +53f3a9a6-1178-11ec-93c4-2fd2206a828d diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml new file mode 100644 index 0000000..fdecb3e --- /dev/null +++ b/src/tests/bundles/focal-xena.yaml @@ -0,0 +1,239 @@ +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': + '9': + '10': + '11': + + +applications: + + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-cloud-controller-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-api-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: 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 + constraints: mem=1G + options: + source: *openstack-origin + to: + - '3' + + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + to: + - '4' + + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + admin-password: openstack + to: + - '5' + + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + num_units: 1 + options: + openstack-origin: *openstack-origin + manage-neutron-plugin-legacy-mode: true + neutron-plugin: ovs + flat-network-providers: physnet1 + neutron-security-groups: true + to: + - '6' + + neutron-openvswitch: + charm: cs:~openstack-charmers-next/neutron-openvswitch + + neutron-gateway: + charm: cs:~openstack-charmers-next/neutron-gateway + num_units: 1 + options: + openstack-origin: *openstack-origin + bridge-mappings: physnet1:br-ex + to: + - '7' + + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + openstack-origin: *openstack-origin + network-manager: Neutron + debug: true + to: + - '8' + + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + constraints: mem=4G + options: + openstack-origin: *openstack-origin + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + debug: true + to: + - '9' + + placement: + charm: ../../../placement + num_units: 1 + constraints: mem=1G + options: + openstack-origin: *openstack-origin + debug: true + to: + - '10' + + vault: + num_units: 1 + charm: cs:~openstack-charmers-next/vault + to: + - '11' + +relations: + + - - 'keystone:shared-db' + - 'keystone-mysql-router:shared-db' + - - 'keystone-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:shared-db' + - 'nova-cloud-controller-mysql-router:shared-db' + - - 'nova-cloud-controller-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'nova-cloud-controller:amqp' + - 'rabbitmq-server:amqp' + + - - 'nova-cloud-controller' + - 'glance' + + - - 'nova-cloud-controller' + - 'keystone' + + - - 'nova-compute' + - 'nova-cloud-controller' + + - - 'nova-compute' + - 'rabbitmq-server:amqp' + + - - 'nova-compute' + - 'glance' + + - - 'glance:shared-db' + - 'glance-mysql-router:shared-db' + - - 'glance-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'glance' + - 'keystone' + + - - 'glance' + - 'rabbitmq-server' + + - - 'neutron-gateway' + - 'nova-cloud-controller' + + - - 'neutron-gateway:amqp' + - 'rabbitmq-server' + + - - 'neutron-api:shared-db' + - 'neutron-api-mysql-router:shared-db' + - - 'neutron-api-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'neutron-api' + - 'rabbitmq-server' + + - - 'neutron-api' + - 'nova-cloud-controller' + + - - 'neutron-api' + - 'neutron-openvswitch' + + - - 'neutron-api' + - 'keystone' + + - - 'neutron-api' + - 'neutron-gateway' + + - - 'neutron-openvswitch' + - 'nova-compute' + + - - 'neutron-openvswitch' + - 'rabbitmq-server' + + - - 'placement:shared-db' + - 'placement-mysql-router:shared-db' + - - 'placement-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'placement' + - 'keystone' + + - - 'placement' + - 'nova-cloud-controller' + + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + + - - 'vault:certificates' + - 'keystone:certificates' + - - 'vault:certificates' + - 'placement:certificates' + - - 'vault:certificates' + - 'neutron-api:certificates' + - - 'vault:certificates' + - 'glance:certificates' + - - 'vault:certificates' + - 'nova-cloud-controller:certificates' 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 c7e7206..e4fe153 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 comment: - 'machines section to decide order of deployment. database sooner = faster' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 755fd35..5bb5434 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -22,14 +22,15 @@ gate_bundles: - focal-ussuri - focal-victoria - focal-wallaby - - groovy-victoria smoke_bundles: - bionic-train dev_bundles: + - focal-xena - hirsute-wallaby + - impish-xena tests_options: force_deploy: - - 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