Sync release-tools and fix Zaza expectations
Sync release-tools in order to fix ResolutionImpossible on tox invocation. See: * https://github.com/openstack-charmers/release-tools/issues/151 * https://github.com/openstack-charmers/release-tools/pull/152 Fix Zaza's expected application status after https://github.com/openstack-charmers/zaza/pull/451 Change-Id: Iaf9602da779fb8a3c408d97675f6767acc0dff13
This commit is contained in:
parent
d7b2786d07
commit
620a4eea5e
|
@ -11,10 +11,6 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
|
|||
# Build requirements
|
||||
charm-tools==2.8.3
|
||||
|
||||
# Workaround until https://github.com/juju/charm-tools/pull/589 gets
|
||||
# published
|
||||
keyring<21
|
||||
|
||||
simplejson
|
||||
|
||||
# Newer versions use keywords that didn't exist in python 3.5 yet (e.g.
|
||||
|
|
|
@ -3,12 +3,6 @@
|
|||
# choices of *requirements.txt files for OpenStack Charms:
|
||||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
# pep8 requirements
|
||||
charm-tools>=2.4.4
|
||||
|
||||
# Workaround until https://github.com/juju/charm-tools/pull/589 gets
|
||||
# published
|
||||
keyring<21
|
||||
|
||||
# Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
|
||||
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
|
||||
|
|
|
@ -24,6 +24,10 @@ target_deploy_status:
|
|||
ironic-conductor:
|
||||
workload-status: blocked
|
||||
workload-status-message: invalid enabled-deploy-interfaces config
|
||||
neutron-openvswitch:
|
||||
# NOTE(lourot): we deploy a bundle in which this subordinate charm has no
|
||||
# principle.
|
||||
num-expected-units: 0
|
||||
|
||||
configure:
|
||||
- zaza.openstack.charm_tests.vault.setup.auto_initialize
|
||||
|
|
|
@ -4,8 +4,6 @@
|
|||
# https://github.com/openstack-charmers/release-tools
|
||||
#
|
||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
||||
# Lint and unit test requirements
|
||||
flake8>=2.2.4
|
||||
|
||||
stestr>=2.2.0
|
||||
|
||||
|
@ -38,10 +36,16 @@ coverage>=3.6
|
|||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||
#
|
||||
# Revisit for removal / mock improvement:
|
||||
#
|
||||
# NOTE(lourot): newer versions of cryptography require a Rust compiler to build,
|
||||
# see
|
||||
# * https://github.com/openstack-charmers/zaza/issues/421
|
||||
# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
|
||||
#
|
||||
netifaces # vault
|
||||
psycopg2-binary # vault
|
||||
tenacity # vault
|
||||
pbr # vault
|
||||
cryptography # vault, keystone-saml-mellon
|
||||
pbr==5.6.0 # vault
|
||||
cryptography<3.4 # vault, keystone-saml-mellon
|
||||
lxml # keystone-saml-mellon
|
||||
hvac # vault, barbican-vault
|
||||
|
|
Loading…
Reference in New Issue