diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh index 54a9a55c68b6562e5e615bff6d2257fe76e3274d..c51fdf2cd1ed90bde6be9d960bd6b2ef9ef26c09 100755 --- a/sbin/run_integration_test.sh +++ b/sbin/run_integration_test.sh @@ -135,9 +135,12 @@ function cleanup { CREATE_TIME="${parts[3]}" echo "Saving logs for job ${TASK_NAME} allocation ${ALLOC_ID}" - docker exec server.station.nomad.nomad-cluster.jumppad.dev nomad alloc logs -stderr "${ALLOC_ID}" "${TASK_NAME}" > "log/allocations/${ALLOC_NAME}-${TASK_NAME}-${CREATE_TIME}-${ALLOC_ID}.stderr.log" - docker exec server.station.nomad.nomad-cluster.jumppad.dev nomad alloc logs -stdout "${ALLOC_ID}" "${TASK_NAME}" > "log/allocations/${ALLOC_NAME}-${TASK_NAME}-${CREATE_TIME}-${ALLOC_ID}.stdout.log" + docker exec server.station.nomad.nomad-cluster.jumppad.dev nomad alloc logs -stderr "${ALLOC_ID}" "${TASK_NAME}" > "log/allocations/${ALLOC_NAME}-${TASK_NAME}-${CREATE_TIME}-${ALLOC_ID}.stderr.log" || true + docker exec server.station.nomad.nomad-cluster.jumppad.dev nomad alloc logs -stdout "${ALLOC_ID}" "${TASK_NAME}" > "log/allocations/${ALLOC_NAME}-${TASK_NAME}-${CREATE_TIME}-${ALLOC_ID}.stdout.log" || true done + + # clean up empty files (most containers log to either stderr or stdout) + find log -size 0 | xargs rm fi if [ -z "${preserve}" ]; then make stop > /dev/null 2>&1