diff --git a/defaults/main.yml b/defaults/main.yml index 3c7a4bac..a96bebb8 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -93,7 +93,9 @@ tempest_pip_packages: - fixtures - junitxml - nose + - oslo.concurrency - oslo.serialization + - pyOpenSSL - python-ceilometerclient - python-cinderclient - python-glanceclient @@ -126,3 +128,5 @@ tempest_enable_instance_password: True ## Tunable overrides tempest_tempest_conf_overrides: {} + +tempest_log_dir: "/var/log/tempest" diff --git a/templates/openstack_tempest_gate.sh.j2 b/templates/openstack_tempest_gate.sh.j2 index ab84a724..cf420f25 100644 --- a/templates/openstack_tempest_gate.sh.j2 +++ b/templates/openstack_tempest_gate.sh.j2 @@ -194,9 +194,9 @@ result=$? # Create junit xml report from test results testr last --subunit | subunit2junitxml > tempest_results.xml cp tempest_results.xml /tmp -if [ -d "/var/log/utility" ];then - # Copy the log to the utility logging directory - cp tempest_results.xml /var/log/utility/tempest_results_$(date +%Y%d%m-%H%M%S).xml +if [ -d "{{ tempest_log_dir }}" ];then + # Copy the log to the tempest_log_dir logging directory + cp tempest_results.xml {{ tempest_log_dir }}/tempest_results_$(date +%Y%d%m-%H%M%S).xml fi popd diff --git a/templates/tempest.conf.j2 b/templates/tempest.conf.j2 index 80fb59c2..fa105f7d 100644 --- a/templates/tempest.conf.j2 +++ b/templates/tempest.conf.j2 @@ -4,7 +4,7 @@ debug = {{ debug }} verbose = {{ verbose }} fatal_deprecations = {{ tempest_fatal_deprecations }} -log_file = /var/log/utility/tempest.log +log_file = {{ tempest_log_dir}}/tempest.log use_stderr = false