Merge "Put nested virtualenv in $TMP"

swift3/test/functional/run_test.sh

@@ -124,6 +124,7 @@ if [ -z "$CEPH_TESTS" ]; then
     coverage report
     coverage html
 else
+    set -e
     pushd ${TEST_DIR}
     git clone https://github.com/swiftstack/s3compat.git
     popd
@@ -132,17 +133,18 @@ else
 
     # ceph/s3-tests has some rather ancient requirements,
     # so drop into another virtualenv
-    virtualenv venv
-    . venv/bin/activate
+    VENV="$(mktemp -d)"
+    virtualenv "$VENV"
+    . "$VENV/bin/activate"
     pip install -r requirements.txt -r ceph-tests/requirements.txt
 
-    S3TEST_CONF="${CONF_DIR}/ceph-s3.conf" ./bin/run_ceph_tests.py
+    S3TEST_CONF="${CONF_DIR}/ceph-s3.conf" ./bin/run_ceph_tests.py || true
 
     # show report
     ./bin/get_ceph_test_attributes.py
     ./bin/report.py --detailed output/ceph-s3.out.yaml \
         --known-failures "${CONF_DIR}/ceph-known-failures-${AUTH}.yaml" \
-        --detailedformat console output/ceph-s3.out.xml  | \
+        --detailedformat console output/ceph-s3.out.xml | \
         tee "${LOG_DEST:-${TEST_DIR}/log}/ceph-s3-summary.log"
 
     # the report's exit code indicates NEW_FAILUREs / UNEXPECTED_PASSes
@@ -150,6 +152,8 @@ else
 
     cp output/ceph-s3.out.xml "${LOG_DEST:-${TEST_DIR}/log}/ceph-s3-details.xml"
     popd
+    rm -rf "$VENV"
+    set +e
 fi
 
 # cleanup