From 6c6a79ec4c96ef68217a3208b2a920abea8fbd04 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 7 Jun 2021 12:39:46 -0600 Subject: [PATCH] Bump molecule to fix testing We need to bump molecule so that we actually test proposed patches in CI. Also pull in the podman plugin. https://github.com/ansible-community/molecule/commit/3d3ce253f396ac0117659bf9f2cbc06c7377b508 Change-Id: I5f15e26332d2b8b1e53539d58fe095997f3151c9 (cherry picked from commit d66f3c80e6593ca9516655970d09d58b1050407e) Signed-off-by: Kevin Carter --- doc/requirements.txt | 11 ++++++++++- molecule-requirements.txt | 3 ++- tox.ini | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-) mode change 120000 => 100644 doc/requirements.txt diff --git a/doc/requirements.txt b/doc/requirements.txt deleted file mode 120000 index 3cfb341d4..000000000 --- a/doc/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -../molecule-requirements.txt \ No newline at end of file diff --git a/doc/requirements.txt b/doc/requirements.txt new file mode 100644 index 000000000..d770c883e --- /dev/null +++ b/doc/requirements.txt @@ -0,0 +1,10 @@ +# this is required for the docs build jobs +ruamel.yaml +ansible>=2.8,!=2.8.9,!=2.9.12,<2.10.0 +sphinx>=2.0.0,!=2.1.0 # BSD +openstackdocstheme +reno +doc8 +bashate +metalsmith +jsonschema # MIT diff --git a/molecule-requirements.txt b/molecule-requirements.txt index 16f6340ab..4c2bdbb7b 100644 --- a/molecule-requirements.txt +++ b/molecule-requirements.txt @@ -8,7 +8,8 @@ pytest-cov pytest-html pytest-xdist mock -molecule>=3.0,<3.1 +molecule>=3.3.4,<3.4 +molecule-podman>=0.3.0 ruamel.yaml testinfra netaddr diff --git a/tox.ini b/tox.ini index 0e55fd47d..e9b4840a4 100644 --- a/tox.ini +++ b/tox.ini @@ -91,6 +91,9 @@ skip_install = True sitepackages = False [testenv:role-addition] +setenv = + UPPER_CONSTRAINTS_FILE=file:///dev/null +install_command = pip install {opts} {packages} basepython = python3 deps = {[testenv:linters]deps}