From 0fdede5d7a6d55d704a25f1a6cf327af3d2c4490 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Thu, 23 Sep 2021 21:56:03 +0200 Subject: [PATCH] Fix CI (1/2) (#284) * New default docker image no longer contains bcrypt. * Install cryptography for ACME tests. * Add constraints. --- tests/integration/targets/setup_acme/meta/main.yml | 1 + tests/integration/targets/setup_acme/tasks/main.yml | 5 +++++ tests/unit/requirements.txt | 1 + 3 files changed, 7 insertions(+) diff --git a/tests/integration/targets/setup_acme/meta/main.yml b/tests/integration/targets/setup_acme/meta/main.yml index ea94bf36..cce7385c 100644 --- a/tests/integration/targets/setup_acme/meta/main.yml +++ b/tests/integration/targets/setup_acme/meta/main.yml @@ -1,3 +1,4 @@ dependencies: # - setup_openssl + - setup_remote_constraints - setup_remote_tmp_dir diff --git a/tests/integration/targets/setup_acme/tasks/main.yml b/tests/integration/targets/setup_acme/tasks/main.yml index b18e5872..72507986 100644 --- a/tests/integration/targets/setup_acme/tasks/main.yml +++ b/tests/integration/targets/setup_acme/tasks/main.yml @@ -9,6 +9,11 @@ set_fact: openssl_binary: openssl +- name: Make sure cryptography is installed + pip: + name: cryptography + extra_args: "-c {{ remote_constraints }}" + - name: Register openssl version shell: "{{ openssl_binary }} version | cut -d' ' -f2" register: openssl_version diff --git a/tests/unit/requirements.txt b/tests/unit/requirements.txt index cf3ec91c..61f5dd4b 100644 --- a/tests/unit/requirements.txt +++ b/tests/unit/requirements.txt @@ -1,6 +1,7 @@ cryptography ipaddress ; python_version < '3.0' pyopenssl +bcrypt unittest2 ; python_version < '2.7' importlib ; python_version < '2.7'