summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey <sshnaidm@users.noreply.github.com>2021-07-29 21:50:29 +0300
committerMatt Clay <matt@mystile.com>2021-07-30 08:41:26 -0700
commitda1baaf4851f802fc6e293f47c3deee0dc33b51f (patch)
tree7ad0c29c342112574fb8e245ca240ceff96e6875
parent647c1db762ee6a9d8ab3ae27393f350dc0e7fbef (diff)
downloadansible-da1baaf4851f802fc6e293f47c3deee0dc33b51f.tar.gz
[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 <sshnaidm@users.noreply.github.com>
-rw-r--r--changelogs/fragments/75356-add-requirement-to-ansible-test.yml2
-rw-r--r--test/integration/targets/ansible-test/ansible_collections/ns/col/meta/runtime.yml1
-rw-r--r--test/lib/ansible_test/_data/requirements/sanity.ansible-doc.txt1
3 files changed, 4 insertions, 0 deletions
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 0000000000..1daf884d20
--- /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 1ac15484db..fee22ad8c6 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 cec0eed3cd..c910f106a8 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