Merge "Add subunit output for total elapsed time"
diff --git a/stack.sh b/stack.sh
index e9831d5..abd6a4d 100755
--- a/stack.sh
+++ b/stack.sh
@@ -42,6 +42,8 @@
set -o nounset
fi
+# Set start of devstack timestamp
+DEVSTACK_START_TIME=$(date +%s)
# Configuration
# =============
@@ -481,11 +483,14 @@
if [[ $r -ne 0 ]]; then
echo "Error on exit"
+ generate-subunit $DEVSTACK_START_TIME $SECONDS 'fail' >> ${SUBUNIT_OUTPUT}
if [[ -z $LOGDIR ]]; then
$TOP_DIR/tools/worlddump.py
else
$TOP_DIR/tools/worlddump.py -d $LOGDIR
fi
+ else
+ generate-subunit $DEVSTACK_START_TIME $SECONDS >> ${SUBUNIT_OUTPUT}
fi
exit $r
@@ -710,6 +715,9 @@
PYPI_ALTERNATIVE_URL=${PYPI_ALTERNATIVE_URL:-""} $TOP_DIR/tools/install_pip.sh
fi
+# Install subunit for the subunit output stream
+pip_install -U os-testr
+
TRACK_DEPENDS=${TRACK_DEPENDS:-False}
# Install Python packages into a virtualenv so that we can track them
diff --git a/stackrc b/stackrc
index 1786a44..58146a4 100644
--- a/stackrc
+++ b/stackrc
@@ -29,6 +29,9 @@
# Destination for status files
SERVICE_DIR=${DEST}/status
+# Path for subunit output file
+SUBUNIT_OUTPUT=${DEST}/devstack.subunit
+
# Determine stack user
if [[ $EUID -eq 0 ]]; then
STACK_USER=stack