Merge "Make Swift/Keystone logs available in gate results"

swift3/test/functional/run_test.sh

@@ -79,21 +79,22 @@ cd -
 _start()
 {
     local name=$1; shift
+    local log_file="${LOG_DEST:-${TEST_DIR}/log}/${name}.log"
+    mkdir -p "$(dirname "${log_file}")"
 
     echo Start ${name}-server.
-    "$@" > ${TEST_DIR}/log/${name}.log 2>&1 &
+    "$@" > "${log_file}" 2>&1 &
     export ${name}_pid=$!
 
     local cnt
     for cnt in `seq 60`; do # wait at most 60 seconds
-	grep 'Started child' ${TEST_DIR}/log/${name}.log > /dev/null
-	if [ $? == 0 ]; then
+	if ! grep 'Started child' "${log_file}" > /dev/null ; then
 	    return
 	fi
 	sleep 1
     done
 
-    cat ${TEST_DIR}/log/${name}.log
+    cat "${log_file}"
     echo "Cannot start ${name}-server."
     exit 1
 }

swift3/test/functional/setup_keystone

@@ -13,6 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+set -e
+
 export OS_AUTH_URL=http://localhost:35357/v2.0
 export OS_TENANT_NAME=admin
 export OS_USERNAME=admin
@@ -75,7 +77,10 @@ _setup_keystone()
 {
     rm -f ${TEST_DIR}/keystone.db 2>&1
 
-    keystone-all --config-file conf/keystone.conf --debug > ${TEST_DIR}/log/keystone.log 2>&1 &
+    local log_file="${LOG_DEST:-${TEST_DIR}/log}/keystone.log"
+    mkdir -p "$(dirname "${log_file}")"
+
+    keystone-all --config-file conf/keystone.conf --debug > "${log_file}" 2>&1 &
     export keystone_pid=$!
 
     keystone-manage --config-file conf/keystone.conf --debug db_sync
@@ -85,3 +90,5 @@ _setup_keystone()
 }
 
 _setup_keystone
+
+set +e

tox.ini

@@ -25,10 +25,12 @@ setenv = VIRTUAL_ENV={envdir}
 [testenv:tempauth]
 commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}
 setenv = AUTH=tempauth
+         LOG_DEST={envdir}/log
 
 [testenv:keystone]
 commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}
 setenv = AUTH=keystone
+         LOG_DEST={envdir}/log
 # keystone 9.0.0 from github
 deps =
   {[testenv]deps}
@@ -37,6 +39,7 @@ deps =
 [testenv:s3acl]
 commands = /bin/bash {posargs:swift3/test/functional/run_test.sh}
 setenv = AUTH=tempauth
+         LOG_DEST={envdir}/log
          S3ACL=true
 
 [testenv:pylint]