Use devstack subunit stream in output

mtreinish · mtreinish · commit 5211df0123c9 · 2016-01-20T10:31:23.000-05:00
Devstack is starting to emit a subunit event for whether devstack
was successful or not and how long it took to execute. This will
enable us to track devstack along with tempest in subunit2sql and also
make local visualizations of devstack easier. Eventually the data in
the devstack stream will be a bit more granular which will enable
additional analysis

Change-Id: I5c2fd8ae8c33edce73836dd0c0c5107dc73685c6
Depends-On: I07112dde996c3e2c73f5aafc9b73d33d26374633
diff --git a/functions.sh b/functions.sh
@@ -630,17 +630,25 @@ function process_testr_artifacts {
         log_path=$BASE/logs/$path_prefix
     fi
 
+    if  [[ -f $BASE/devstack.subunit ]]; then
+        sudo cp $BASE/devstack.subunit $log_path/testrepository.subunit
+    fi
+
     # Check for an interrupted run first because 0 will always exist
     if [ -f $repo_path/tmp* ]; then
         # If testr timed out, collect temp file from testr
-        sudo cp $repo_path/tmp* $log_path/testrepository.subunit
-        archive_test_artifact $log_path/testrepository.subunit
+        sudo cat $repo_path/tmp* >> $WORKSPACE/tempest.subunit
+        archive_test_artifact $WORKSPACE/tempest.subunit
     elif [ -f $repo_path/0 ]; then
         pushd $project_path
-        sudo testr last --subunit > $WORKSPACE/testrepository.subunit
+        sudo testr last --subunit > $WORKSPACE/tempest.subunit
         popd
-        sudo mv $WORKSPACE/testrepository.subunit \
-            $log_path/testrepository.subunit
+    fi
+    if [[ -f $log_path/testrepository.subunit ]] ; then
+        if [[ -f $WORKSPACE/tempest.subunit ]] ; then
+            sudo cat $WORKSPACE/tempest.subunit \
+                | sudo tee -a $log_path/testrepository.subunit > /dev/null
+        fi
         sudo /usr/os-testr-env/bin/subunit2html \
             $log_path/testrepository.subunit $log_path/testr_results.html
         archive_test_artifact $log_path/testrepository.subunit
