diff options
| author | Matt Clay <matt@mystile.com> | 2022-05-20 01:44:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-20 01:44:57 -0700 |
| commit | caf8b22472afae0b8117c791d811df9e2fa8774e (patch) | |
| tree | 47213ebbf3fdb0365f6b7b6644543f8171cb1d81 | |
| parent | 3f5a4a7c6a7d8db7b9cc405b5bce3e9ee23b8943 (diff) | |
| download | ansible-caf8b22472afae0b8117c791d811df9e2fa8774e.tar.gz | |
ansible-test - Add Python 2 certifi constraint. (#77863)
* ansible-test - Add Python 2 certifi constraint.
* Fix consul test.
* Fix consul test for centos6.
4 files changed, 6 insertions, 0 deletions
diff --git a/changelogs/fragments/ansible-test-certifi.yml b/changelogs/fragments/ansible-test-certifi.yml new file mode 100644 index 0000000000..f3f1e6c126 --- /dev/null +++ b/changelogs/fragments/ansible-test-certifi.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Add certifi constraint for Python 2. diff --git a/test/integration/targets/consul/meta/main.yml b/test/integration/targets/consul/meta/main.yml index f5ea812bf8..9ad3f9fabd 100644 --- a/test/integration/targets/consul/meta/main.yml +++ b/test/integration/targets/consul/meta/main.yml @@ -1,3 +1,4 @@ --- dependencies: - setup_openssl + - setup_remote_constraints diff --git a/test/integration/targets/consul/tasks/main.yml b/test/integration/targets/consul/tasks/main.yml index 575c2ed9fb..0ea26cd28b 100644 --- a/test/integration/targets/consul/tasks/main.yml +++ b/test/integration/targets/consul/tasks/main.yml @@ -14,6 +14,7 @@ - name: Install requests<2.20 (CentOS/RHEL 6) pip: name: requests<2.20 + extra_args: "-c {{ remote_constraints }}" register: result until: result is success when: ansible_distribution_file_variety|default() == 'RedHat' and ansible_distribution_major_version is version('6', '<=') @@ -21,6 +22,7 @@ - name: Install python-consul pip: name: python-consul + extra_args: "-c {{ remote_constraints }}" register: result until: result is success diff --git a/test/lib/ansible_test/_data/requirements/constraints.txt b/test/lib/ansible_test/_data/requirements/constraints.txt index bdb3767aee..5c649be074 100644 --- a/test/lib/ansible_test/_data/requirements/constraints.txt +++ b/test/lib/ansible_test/_data/requirements/constraints.txt @@ -46,6 +46,7 @@ botocore >= 1.10.0 # adds support for the following AWS services: secretsmanager setuptools < 45 ; python_version <= '2.7' # setuptools 45 and later require python 3.5 or later cffi != 1.14.4 # Fails on systems with older gcc. Should be fixed in the next release. https://foss.heptapod.net/pypy/cffi/-/issues/480 websocket-client < 1 ; python_version < '3' # version 1.0.0 drops support for python 2 +certifi < 2020.4.5.2 ; python_version < '3' # version 2020.4.5.2 drops support for python 2 # freeze pylint and its requirements for consistent test results astroid == 2.3.3 |