From 24a080caeaa6d15896ee8b76b7df0c762ed0de9a Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 16 Sep 2020 09:53:27 +0200 Subject: [PATCH 1/3] Avoid cffi 1.14.3 to be installed in CI by old pip versions. --- tests/integration/targets/setup_openssl/meta/main.yml | 1 + tests/integration/targets/setup_openssl/tasks/main.yml | 1 + tests/utils/constraints.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/integration/targets/setup_openssl/meta/main.yml b/tests/integration/targets/setup_openssl/meta/main.yml index 5438ced5c..2be15776b 100644 --- a/tests/integration/targets/setup_openssl/meta/main.yml +++ b/tests/integration/targets/setup_openssl/meta/main.yml @@ -1,2 +1,3 @@ dependencies: + - setup_remote_constraints - setup_pkg_mgr diff --git a/tests/integration/targets/setup_openssl/tasks/main.yml b/tests/integration/targets/setup_openssl/tasks/main.yml index 5a634458e..fa9f08736 100644 --- a/tests/integration/targets/setup_openssl/tasks/main.yml +++ b/tests/integration/targets/setup_openssl/tasks/main.yml @@ -25,6 +25,7 @@ become: True pip: name: pyOpenSSL + extra_args: "-c {{ remote_constraints }}" when: ansible_os_family == 'Darwin' - name: register pyOpenSSL version diff --git a/tests/utils/constraints.txt b/tests/utils/constraints.txt index b96d623cd..1e638fb52 100644 --- a/tests/utils/constraints.txt +++ b/tests/utils/constraints.txt @@ -40,6 +40,7 @@ boto3 < 1.11 ; python_version < '2.7' # boto3 1.11 drops Python 2.6 support botocore >= 1.10.0, < 1.14 ; python_version < '2.7' # adds support for the following AWS services: secretsmanager, fms, and acm-pca; botocore 1.14 drops Python 2.6 support botocore >= 1.10.0 ; python_version >= '2.7' # adds support for the following AWS services: secretsmanager, fms, and acm-pca setuptools < 45 ; python_version <= '2.7' # setuptools 45 and later require python 3.5 or later +cffi != 1.14.3 # Yanked version which older versions of pip will still install: # freeze pylint and its requirements for consistent test results astroid == 2.2.5 From 734cf9a154b63d73aeb88af8a7dbbe7bf1c50530 Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 16 Sep 2020 10:00:39 +0200 Subject: [PATCH 2/3] Avoid too old version being installed. --- tests/utils/constraints.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/utils/constraints.txt b/tests/utils/constraints.txt index 1e638fb52..ae6000ae1 100644 --- a/tests/utils/constraints.txt +++ b/tests/utils/constraints.txt @@ -40,7 +40,7 @@ boto3 < 1.11 ; python_version < '2.7' # boto3 1.11 drops Python 2.6 support botocore >= 1.10.0, < 1.14 ; python_version < '2.7' # adds support for the following AWS services: secretsmanager, fms, and acm-pca; botocore 1.14 drops Python 2.6 support botocore >= 1.10.0 ; python_version >= '2.7' # adds support for the following AWS services: secretsmanager, fms, and acm-pca setuptools < 45 ; python_version <= '2.7' # setuptools 45 and later require python 3.5 or later -cffi != 1.14.3 # Yanked version which older versions of pip will still install: +cffi >= 1.14.2, != 1.14.3 # Yanked version which older versions of pip will still install: # freeze pylint and its requirements for consistent test results astroid == 2.2.5 From 0a7909fdd2df2de7ba7e0307864709e4fd71bc1d Mon Sep 17 00:00:00 2001 From: Felix Fontein Date: Wed, 16 Sep 2020 10:05:10 +0200 Subject: [PATCH 3/3] Add missing target. --- .../integration/targets/setup_remote_constraints/aliases | 1 + .../targets/setup_remote_constraints/meta/main.yml | 2 ++ .../targets/setup_remote_constraints/tasks/main.yml | 8 ++++++++ 3 files changed, 11 insertions(+) create mode 100644 tests/integration/targets/setup_remote_constraints/aliases create mode 100644 tests/integration/targets/setup_remote_constraints/meta/main.yml create mode 100644 tests/integration/targets/setup_remote_constraints/tasks/main.yml diff --git a/tests/integration/targets/setup_remote_constraints/aliases b/tests/integration/targets/setup_remote_constraints/aliases new file mode 100644 index 000000000..1ad133ba0 --- /dev/null +++ b/tests/integration/targets/setup_remote_constraints/aliases @@ -0,0 +1 @@ +needs/file/tests/utils/constraints.txt diff --git a/tests/integration/targets/setup_remote_constraints/meta/main.yml b/tests/integration/targets/setup_remote_constraints/meta/main.yml new file mode 100644 index 000000000..1810d4bec --- /dev/null +++ b/tests/integration/targets/setup_remote_constraints/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - setup_remote_tmp_dir diff --git a/tests/integration/targets/setup_remote_constraints/tasks/main.yml b/tests/integration/targets/setup_remote_constraints/tasks/main.yml new file mode 100644 index 000000000..d19d929ad --- /dev/null +++ b/tests/integration/targets/setup_remote_constraints/tasks/main.yml @@ -0,0 +1,8 @@ +- name: record constraints.txt path on remote host + set_fact: + remote_constraints: "{{ remote_tmp_dir }}/constraints.txt" + +- name: copy constraints.txt to remote host + copy: + src: "{{ role_path }}/../../../utils/constraints.txt" + dest: "{{ remote_constraints }}"