From d3c1fb750015cfb62949cc16eea9e7494218b197 Mon Sep 17 00:00:00 2001 From: Jordan Lewis Date: Fri, 17 Mar 2017 10:59:21 -0400 Subject: [PATCH] build: jepsen log archiver must follow symlinks --- build/teamcity-jepsen.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/teamcity-jepsen.sh b/build/teamcity-jepsen.sh index 7ad69eccffd4..d2d31c44f192 100755 --- a/build/teamcity-jepsen.sh +++ b/build/teamcity-jepsen.sh @@ -74,7 +74,8 @@ for test in "${tests[@]}"; do # Test failed: grab everything. echo "Test failed. Grabbing all logs..." archive_path="jepsen/cockroachdb/store/failure-logs.tgz" - ssh -o "StrictHostKeyChecking no" -i "$HOME/.ssh/${KEY_NAME}" "ubuntu@${controller}" "tar -czf ${archive_path} jepsen/cockroachdb/store/latest" + # -h causes tar to follow symlinks; needed by the `latest` symlink. + ssh -o "StrictHostKeyChecking no" -i "$HOME/.ssh/${KEY_NAME}" "ubuntu@${controller}" "tar -chzf ${archive_path} jepsen/cockroachdb/store/latest" scp -o "StrictHostKeyChecking no" -ri "$HOME/.ssh/${KEY_NAME}" "ubuntu@${controller}:${archive_path}" "${artifacts_dir}" echo "##teamcity[testFailed name='${test} ${nemesis}']" else