Skip to content

Commit

Permalink
[SPARK-10657] Remove SCP-based Jenkins log archiving
Browse files Browse the repository at this point in the history
As of https://issues.apache.org/jira/browse/SPARK-7561, we no longer need to use our custom SCP-based mechanism for archiving Jenkins logs on the master machine; this has been superseded by the use of a Jenkins plugin which archives the logs and provides public links to view them.

Per shaneknapp, we should remove this log syncing mechanism if it is no longer necessary; removing the need to SCP from the Jenkins workers to the masters is a desired step as part of some larger Jenkins infra refactoring.

Author: Josh Rosen <[email protected]>

Closes #8793 from JoshRosen/remove-jenkins-ssh-to-master.

(cherry picked from commit f1c9115)
Signed-off-by: Josh Rosen <[email protected]>
  • Loading branch information
JoshRosen committed Sep 17, 2015
1 parent 7494034 commit 64730a3
Showing 1 changed file with 0 additions and 35 deletions.
35 changes: 0 additions & 35 deletions dev/run-tests-jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -98,39 +98,6 @@ function post_message () {
fi
}

function send_archived_logs () {
echo "Archiving unit tests logs..."

local log_files=$(
find .\
-name "unit-tests.log" -o\
-path "./sql/hive/target/HiveCompatibilitySuite.failed" -o\
-path "./sql/hive/target/HiveCompatibilitySuite.hiveFailed" -o\
-path "./sql/hive/target/HiveCompatibilitySuite.wrong"
)

if [ -z "$log_files" ]; then
echo "> No log files found." >&2
else
local log_archive="unit-tests-logs.tar.gz"
echo "$log_files" | xargs tar czf ${log_archive}

local jenkins_build_dir=${JENKINS_HOME}/jobs/${JOB_NAME}/builds/${BUILD_NUMBER}
local scp_output=$(scp ${log_archive} amp-jenkins-master:${jenkins_build_dir}/${log_archive})
local scp_status="$?"

if [ "$scp_status" -ne 0 ]; then
echo "Failed to send archived unit tests logs to Jenkins master." >&2
echo "> scp_status: ${scp_status}" >&2
echo "> scp_output: ${scp_output}" >&2
else
echo "> Send successful."
fi

rm -f ${log_archive}
fi
}


# We diff master...$ghprbActualCommit because that gets us changes introduced in the PR
#+ and not anything else added to master since the PR was branched.
Expand Down Expand Up @@ -223,8 +190,6 @@ function send_archived_logs () {

test_result_note=" * This patch **fails $failing_test**."
fi

send_archived_logs
}

# post end message
Expand Down

0 comments on commit 64730a3

Please sign in to comment.