From: Aric Gardner <agardner@linuxfoundation.org>
Date: Mon, 21 Oct 2019 20:47:16 +0000 (-0400)
Subject: Install tree command
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=84c31d88afc49fc2a8f586e0a7e9ed98ddbeaeda;p=ansible%2Froles%2Flf-recommended-tools.git

Install tree command

The tree command is required to create index files
which is required for bucket level file listing on
AWS S3.

molecule tests fail on python3!

TASK [Create Dockerfiles from image names]
*************************************
13:55:49     failed: [localhost] (item=None) => {"censored": "the output
has been hidden due to the fact that 'no_log: true' was specified for
this result", "changed": false}
    fixed with:
+export MOLECULE_DEBUG=True

"msg": "Aborting, target uses selinux but python bindings
(libselinux-python) aren't installed!"
    fixed with:
deps = selinux

libselinux python3 bindins are missing from centos7.7
https://bugs.centos.org/view.php?id=16389
    fixed with:
-basepython = python3

WARNING: test command found but not installed in testenv
    fixed with:
whitelist_externals = which

Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Change-Id: I66025284e0251b248cb035207d17034531709616
---

diff --git a/molecule.sh b/molecule.sh
index 2792bbd..6d36885 100755
--- a/molecule.sh
+++ b/molecule.sh
@@ -15,4 +15,6 @@ if [ ! -z "$JENKINS_URL" ]; then
     ln -sf "$WORKSPACE" ../lf-recommended-tools
 fi
 
+# Output is hidden unless this is set
+export MOLECULE_DEBUG=True
 molecule test --destroy=always
diff --git a/tox.ini b/tox.ini
index 369e151..8b17a1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,12 +6,13 @@ envlist =
 skipsdist=true
 
 [testenv:molecule]
-basepython = python3
+whitelist_externals = which
 deps =
     ansible~=2.7.11
     ansible-lint~=4.0.1
     docker
     molecule
+    selinux
     # pytest 5 requires Python >= 3.5
     pytest~=4.6.4
 passenv = *
diff --git a/vars/main.yml b/vars/main.yml
index 41e4b3e..912d27a 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -13,6 +13,7 @@ lf_recommended_tools_packages_common:
   - jq
   - sshpass
   - sshuttle
+  - tree
   - unzip
   - wget
   - xmlstarlet