From b6f6067dfd00fc9a20ebf7ea8719461b7dcf24fd Mon Sep 17 00:00:00 2001 From: Sam Doran Date: Wed, 15 Jul 2020 18:32:09 -0400 Subject: [PATCH] [stable-2.10] ansible_runner test - Add constraints (#70667) (#70669) A recent updated to psutil, which is a dependency of ansible-runner, fails to install on older versions of pip. Commit with the breaking change: https://github.com/giampaolo/psutil/commit/135628639bd6d73b5e88aefe300acd13a04a858d (cherry picked from commit 9d27d7c8b1) Co-authored-by: Sam Doran --- changelogs/fragments/test-ansible-runner-pin-psutil.yml | 2 ++ .../integration/targets/ansible-runner/files/constraints.txt | 5 +++++ test/integration/targets/ansible-runner/tasks/setup.yml | 2 ++ 3 files changed, 9 insertions(+) create mode 100644 changelogs/fragments/test-ansible-runner-pin-psutil.yml create mode 100644 test/integration/targets/ansible-runner/files/constraints.txt diff --git a/changelogs/fragments/test-ansible-runner-pin-psutil.yml b/changelogs/fragments/test-ansible-runner-pin-psutil.yml new file mode 100644 index 00000000000..99de860bde5 --- /dev/null +++ b/changelogs/fragments/test-ansible-runner-pin-psutil.yml @@ -0,0 +1,2 @@ +bugfixes: + - add constraints file for ``anisble_runner`` test since an update to ``psutil`` is now causing test failures diff --git a/test/integration/targets/ansible-runner/files/constraints.txt b/test/integration/targets/ansible-runner/files/constraints.txt new file mode 100644 index 00000000000..c3e394029eb --- /dev/null +++ b/test/integration/targets/ansible-runner/files/constraints.txt @@ -0,0 +1,5 @@ +psutil < 5.7.0 # Greater than this version breaks on older pip +pexpect >= 4.5, <= 4.8.0 +python-daemon <= 2.2.4 +pyyaml < 5.1 ; python_version < '2.7' # pyyaml 5.1 and later require python 2.7 or later +six <= 1.14.0 diff --git a/test/integration/targets/ansible-runner/tasks/setup.yml b/test/integration/targets/ansible-runner/tasks/setup.yml index e67f1d4b7f7..ea24ced52cf 100644 --- a/test/integration/targets/ansible-runner/tasks/setup.yml +++ b/test/integration/targets/ansible-runner/tasks/setup.yml @@ -6,6 +6,8 @@ pip: name: ansible-runner version: 1.2.0 + extra_args: + -c {{ role_path }}/files/constraints.txt - name: Find location of ansible-runner installation command: "'{{ ansible_python_interpreter }}' -c 'import os, ansible_runner; print(os.path.dirname(ansible_runner.__file__))'"