Separate tox dependencies

Having tox dependencies in a separate file can help to easily track
changes and licenses of them. This change creates a
`test-requirements.txt` for listing those dependencies.

Signed-off-by: Victor Morales <v.morales@samsung.com>
Change-Id: I779055d0d885c7f92c359dab6dae62344ae74600
Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/71023
Tested-by: jenkins-ci <jenkins-opnfv-ci@opnfv.org>
Reviewed-by: Rihab Banday <rihab.banday@ericsson.com>

diff --git a/.gitignore b/.gitignore
index c9e2bff..5c469ed 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -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 (executable)
--- 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 (file)
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

diff --git a/tox.ini b/tox.ini
index 1879ded..53ab1a7 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -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/\* \