Merge "Tweak the role-addition tox job"

tox.ini

@@ -114,5 +114,10 @@ deps=
   {[testenv:linters]deps}
 commands =
     bash -c "ansible-playbook -i localhost, role-addition.yml -e role_name=skeleton_test"
-    bash -c "pushd {toxinidir}/tripleo_ansible/roles/skeleton_test; molecule test --all; popd"
+    bash -c "if (podman ps 2> /dev/null || docker ps 2> /dev/null); then  \
+                cd {toxinidir}/tripleo_ansible/roles/skeleton_test;  \
+                molecule test --all;  \
+            else  \
+                echo -e '\n\nNo molecule tests have been executed\nSee https://docs.openstack.org/tripleo-ansible/latest/contributing.html#local-testing-of-new-roles\n\n';  \
+            fi"
     {[testenv:linters]commands}

zuul.d/molecule.yaml

@@ -80,9 +80,10 @@
     files:
     - ^_skeleton_role_/.*
     - ^role-addition.yml
+    - ^tox.ini
     name: tripleo-ansible-centos-7-role-addition
     nodeset: centos-7
-    parent: openstack-tox
+    parent: tox-molecule
     timeout: 1800
     vars:
       tox_envlist: role-addition