From dc607cbe2f2f7d594a68b7468e0d255887ba641f Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 29 Jul 2021 21:50:29 +0300 Subject: [PATCH] [stable-2.11] Add packaging to requirement of ansible-test (#75356) * Add packaging to requirement of ansible-test Fix #75353 After requires_ansible field was added as mandatory to runtime.yml file, ansible-test fails to check this field if it doesn't have packaging module. [1] https://github.com/ansible/galaxy-importer/pull/124 (cherry picked from commit 40ca87a963736ac1420f3b62b37a8a3bae93da50) Co-authored-by: Sergey --- changelogs/fragments/75356-add-requirement-to-ansible-test.yml | 2 ++ .../ansible-test/ansible_collections/ns/col/meta/runtime.yml | 1 + test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt | 1 + 3 files changed, 4 insertions(+) create mode 100644 changelogs/fragments/75356-add-requirement-to-ansible-test.yml diff --git a/changelogs/fragments/75356-add-requirement-to-ansible-test.yml b/changelogs/fragments/75356-add-requirement-to-ansible-test.yml new file mode 100644 index 00000000000000..1daf884d20bb82 --- /dev/null +++ b/changelogs/fragments/75356-add-requirement-to-ansible-test.yml @@ -0,0 +1,2 @@ +bugfixes: +- ansible-test - add packaging python module to ``ansible-doc`` sanity test requirements. diff --git a/test/integration/targets/ansible-test/ansible_collections/ns/col/meta/runtime.yml b/test/integration/targets/ansible-test/ansible_collections/ns/col/meta/runtime.yml index 1ac15484dbb1dc..fee22ad8c68da7 100644 --- a/test/integration/targets/ansible-test/ansible_collections/ns/col/meta/runtime.yml +++ b/test/integration/targets/ansible-test/ansible_collections/ns/col/meta/runtime.yml @@ -1,3 +1,4 @@ +requires_ansible: '>=2.11' # force ansible-doc to check the Ansible version (requires packaging) plugin_routing: modules: hi: diff --git a/test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt b/test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt index cec0eed3cd5b12..c910f106a80ebe 100644 --- a/test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt +++ b/test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt @@ -1,2 +1,3 @@ jinja2 # ansible-core requirement pyyaml # ansible-core requirement +packaging # ansible-doc requirement