From 0bf4186e3d35843a631b0ca13b9c155b9cd7950e Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 1 Jul 2019 09:34:01 -0500 Subject: [PATCH] Move test_json_error_callback params into molecule This change moves the environment parameters from the tox config into the role specific molecule config. This is being done for test clarity as the tox environment is obscuring the required configuration for the plugin. Change-Id: I115a3ba6fca5f989299136ec40da37f52b6cddef Signed-off-by: Kevin Carter --- tox.ini | 5 ----- .../test_json_error_callback/molecule/default/molecule.yml | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tox.ini b/tox.ini index b31ca8452..21060d7f3 100644 --- a/tox.ini +++ b/tox.ini @@ -139,11 +139,6 @@ commands = python -m pytest --color=yes --html={envlogdir}/reports.html --self-contained-html {tty:-s} {toxinidir}/tests/test_molecule.py [testenv:mol-test_json_error_callback] -setenv = - {[testenv]setenv} - JSON_ERROR_LOG_FILE=/tmp/json_error.log - ANSIBLE_LOAD_CALLBACK_PLUGINS=true - ANSIBLE_CALLBACK_WHITELIST=json_error basepython = {[testenv:mol]basepython} deps = {[testenv:mol]deps} changedir = {toxinidir}/tripleo_ansible/roles/test_json_error_callback diff --git a/tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml b/tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml index 513dcec24..b9e1b4ad1 100644 --- a/tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml +++ b/tripleo_ansible/roles/test_json_error_callback/molecule/default/molecule.yml @@ -30,9 +30,13 @@ platforms: provisioner: name: ansible + config_options: + defaults: + callback_whitelist: json_error log: true env: ANSIBLE_STDOUT_CALLBACK: yaml + JSON_ERROR_LOG_FILE: /tmp/json_error.log scenario: test_sequence: