Merge pull request cockroachdb#14229 from jordanlewis/jepsen-artifact…

…s-compress build: jepsen log archiver must follow symlinks
a-robinson · Mar 17, 2017 · c1c55b1 · c1c55b1
2 parents 587d06c + d3c1fb7
commit c1c55b1
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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