From 834dabccf12987fad3d057562ada9b3cf477cece Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Mon, 28 Jun 2021 14:42:10 +0200
Subject: [PATCH] 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
---
 src/tests/tests.yaml  | 5 +++++
 src/wheelhouse.txt    | 6 +++++-
 test-requirements.txt | 8 +++++++-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 397d64b..b9056a5 100644
--- a/src/tests/tests.yaml
+++ b/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"
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 947dc7f..e7cb646 100644
--- a/src/wheelhouse.txt
+++ b/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
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 3f08524..0c0ad09 100644
--- a/test-requirements.txt
+++ b/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