From 70c59423fcfeb7560299612189df4b56379a2842 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Tue, 23 Jun 2020 10:09:06 -0700 Subject: [PATCH] Pin ansible-test requirements for RHEL. The `packaging` and `pyparsing` packages are now installed by `ansible-test` during provisioning of RHEL instances to match the downstream vendored versions. --- changelogs/fragments/ansible-test-rhel-requirements.yml | 2 ++ test/lib/ansible_test/_data/setup/remote.sh | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 changelogs/fragments/ansible-test-rhel-requirements.yml diff --git a/changelogs/fragments/ansible-test-rhel-requirements.yml b/changelogs/fragments/ansible-test-rhel-requirements.yml new file mode 100644 index 00000000000..8ad83b129a0 --- /dev/null +++ b/changelogs/fragments/ansible-test-rhel-requirements.yml @@ -0,0 +1,2 @@ +minor_changes: + - ansible-test - Provisioning of RHEL instances now includes installation of pinned versions of ``packaging`` and ``pyparsing`` to match the downstream vendored versions. diff --git a/test/lib/ansible_test/_data/setup/remote.sh b/test/lib/ansible_test/_data/setup/remote.sh index 6a70863a0ee..f6b537009b6 100644 --- a/test/lib/ansible_test/_data/setup/remote.sh +++ b/test/lib/ansible_test/_data/setup/remote.sh @@ -70,6 +70,9 @@ elif [ "${platform}" = "rhel" ]; then install_pip fi + + # pin packaging and pyparsing to match the downstream vendored versions + "${python_interpreter}" -m pip install packaging==20.4 pyparsing==2.4.7 --disable-pip-version-check elif [ "${platform}" = "centos" ]; then while true; do yum install -q -y \