diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | functions.sh | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 7 | ||||
| -rw-r--r-- | tox.ini | 4 |
4 files changed, 10 insertions, 4 deletions
@@ -7,3 +7,4 @@ kuberef/inventory/group_vars/all/idf.yaml kuberef/inventory/group_vars/all/pdf.yaml images workspace +.tox diff --git a/functions.sh b/functions.sh index e64bf91..25f76ea 100755 --- a/functions.sh +++ b/functions.sh @@ -167,7 +167,7 @@ if [ ! -d "${PROJECT_ROOT}/container-experience-kits" ]; then cp -r ${PROJECT_ROOT}/container-experience-kits/examples/group_vars ${PROJECT_ROOT}/container-experience-kits/ #TODO Remove this once the reported issue is fixed in the next BMRA Release sed -i '/\openshift/a \ extra_args: --ignore-installed PyYAML' \ - ${PROJECT_ROOT}/container-experience-kits/roles/net-attach-defs-create/tasks/main.yml + ${PROJECT_ROOT}/container-experience-kits/roles/net-attach-defs-create/tasks/main.yml fi cp ${PROJECT_ROOT}/${INSTALLER}/inventory.ini \ ${PROJECT_ROOT}/container-experience-kits/ diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 0000000..1580d0c --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,7 @@ +# The order of packages is significant, because pip processes them in the order +# of appearance. Changing the order has an impact on the overall integration +# process, which may cause wedges in the gate later. + +yamllint # LGPLv3 +bashate # Apache-2.0 +rstcheck # MIT @@ -8,9 +8,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:lint] deps = - {env:BASHATE_INSTALL_PATH:bashate} - yamllint - rstcheck + -r{toxinidir}/test-requirements.txt whitelist_externals = bash commands = bash -c "find {toxinidir} \ -not -path {toxinidir}/.tox/\* \ |