From ba51c4c7d1921b7fc481de8dfab991d7029bc2c0 Mon Sep 17 00:00:00 2001
From: "Jesse Pretorius (odyssey4me)" <jesse.pretorius@rackspace.co.uk>
Date: Thu, 13 Dec 2018 17:49:33 +0000
Subject: [PATCH] Revert "Use tempest run for generating subunit results"

This reverts commit ea8ae41f6146d762bfe4b146a71dbda6740dcf08.

When using this patch, tempest seems to always have a return code
of 0, so it looks like the tests passed even when they did not.

Also, the 'always' section of the block was mistakenly removed.

Change-Id: Ia2433924ad830edb23b1b061b277344bbf477ab9
---
 defaults/main.yml     |  2 ++
 tasks/tempest_run.yml | 25 ++++++++++++++++++++++++-
 vars/ubuntu.yml       |  2 ++
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index ff8ea4b7..0022dc57 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -16,6 +16,8 @@
 ## Verbosity Options
 debug: False
 
+stestr_executable: "{{ _stestr_executable | default('stestr') }}"
+
 # Install openstack tempest
 # set the tempest_install_method to source or distro
 # on choosing source it will install from git or venv
diff --git a/tasks/tempest_run.yml b/tasks/tempest_run.yml
index a0417a34..05a8ce00 100644
--- a/tasks/tempest_run.yml
+++ b/tasks/tempest_run.yml
@@ -21,7 +21,7 @@
       then
       . {{ tempest_venv_bin }}/activate
       fi
-      tempest run {% if tempest_run_concurrency is defined %}{% if tempest_run_concurrency | int > 0 %}--concurrency {{ tempest_run_concurrency | int }}{% else %}--serial{% endif %}{% endif %} --whitelist-file {{ tempest_test_whitelist_file_path }}{% if tempest_test_blacklist | length > 0 %} --blacklist-file {{ tempest_test_blacklist_file_path }}{% endif %} --subunit > {{ tempest_log_dir }}/testrepository.subunit
+      tempest run {% if tempest_run_concurrency is defined %}{% if tempest_run_concurrency | int > 0 %}--concurrency {{ tempest_run_concurrency | int }}{% else %}--serial{% endif %}{% endif %} --whitelist-file {{ tempest_test_whitelist_file_path }}{% if tempest_test_blacklist | length > 0 %} --blacklist-file {{ tempest_test_blacklist_file_path }}{% endif %}
     args:
       chdir: "{{ tempest_workspace }}"
       executable: /bin/bash
@@ -31,6 +31,29 @@
       # don't trigger ANSIBLE0013
       - skip_ansible_lint
 
+  always:
+  - name: Generate raw subunit results
+    # Despite not using testrepository, we leave the output filename as
+    # testrepository.subunit as the OpenStack Health dashboard relies on
+    # subunit files with this particular name.
+    # NOTE(mattt): At present we're not placing this file in a valid location
+    # to be used by the OpenStack Health dashboard.
+    shell: |
+      set -e
+      if [ -d {{ tempest_venv_bin }} ];
+      then
+      . {{ tempest_venv_bin }}/activate
+      fi
+      {{ stestr_executable }} last --subunit > {{ tempest_log_dir }}/testrepository.subunit
+    args:
+      chdir: "{{ tempest_workspace }}"
+      executable: /bin/bash
+    changed_when: false
+    failed_when: false
+    tags:
+      # don't trigger ANSIBLE0013
+      - skip_ansible_lint
+
   - name: Generate xml subunit results
     shell: |
       set -e
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index 6b8dcb9f..77e1a426 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -16,6 +16,8 @@
 ## APT Cache options
 cache_timeout: 600
 
+_stestr_executable: "{{ (tempest_install_method == 'distro') | ternary('testr', 'stestr') }}"
+
 tempest_distro_packages:
   - git-core
   - libxslt1.1           # required by the python module unittest2