Browse Source

Fix the build

Pin cryptography both in the wheelhouse and the
release-tools boilerplate. The latter comes from
https://github.com/openstack-charmers/release-tools/pull/148

Fix Zaza's expected application status after
https://github.com/openstack-charmers/zaza/pull/451

Change-Id: I3d8fbdd8f464ae5d5f24f0b8786218fa13f7b893
changes/92/798292/2
Aurelien Lourot 11 months ago
parent
commit
834dabccf1
  1. 5
      src/tests/tests.yaml
  2. 6
      src/wheelhouse.txt
  3. 8
      test-requirements.txt

5
src/tests/tests.yaml

@ -37,6 +37,11 @@ target_deploy_status:
vault:
workload-status: blocked
workload-status-message: Vault needs to be initialized
keystone-saml-mellon:
# NOTE(lourot): because this is the charm name, Zaza automatically
# deploys this application with no unit, although we don't mention it in
# any test bundle.
num-expected-units: 0
keystone-saml-mellon1:
workload-status: blocked
workload-status-message: "Configuration is incomplete. idp-metadata: idp-metadata resource has not been provided,sp-signing-keyinfo: sp-signing-keyinfo resource has not been provided,sp-private-key: sp-private-key resource has not been provided"

6
src/wheelhouse.txt

@ -1,4 +1,8 @@
cryptography
# 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
cryptography<3.4
lxml
psutil

8
test-requirements.txt

@ -38,10 +38,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
cryptography<3.4 # vault, keystone-saml-mellon
lxml # keystone-saml-mellon
hvac # vault, barbican-vault

Loading…
Cancel
Save