Skip to content

Commit e3f63c7

Browse files
author
Brennon York
committed
added '-f' to the checkout flags for git
1 parent 710c8d1 commit e3f63c7

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

dev/run-tests-jenkins

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ COMMIT_URL="https://github.com/apache/spark/commit/${ghprbActualCommit}"
4747
# GitHub doesn't auto-link short hashes when submitted via the API, unfortunately. :(
4848
SHORT_COMMIT_HASH="${ghprbActualCommit:0:7}"
4949

50-
TESTS_TIMEOUT="150m" # format: http://linux.die.net/man/1/timeout
50+
TESTS_TIMEOUT="120m" # format: http://linux.die.net/man/1/timeout
5151

5252
# Array to capture all tests to run on the pull request. These tests are held under the
5353
#+ dev/tests/ directory.

dev/tests/pr_new_dependencies.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ CURR_CP_FILE="my-classpath.txt"
3939
MASTER_CP_FILE="master-classpath.txt"
4040

4141
# First switch over to the master branch
42-
git checkout master &>/dev/null
42+
git checkout -f master &>/dev/null
4343
# Find and copy all pom.xml files into a *.gate file that we can check
4444
# against through various `git` changes
4545
find -name "pom.xml" -exec cp {} {}.gate \;
4646
# Switch back to the current PR
47-
git checkout "${current_pr_head}" &>/dev/null
47+
git checkout -f "${current_pr_head}" &>/dev/null
4848

4949
# Check if any *.pom files from the current branch are different from the master
5050
difference_q=""
@@ -71,7 +71,7 @@ else
7171
sort > ${CURR_CP_FILE}
7272

7373
# Checkout the master branch to compare against
74-
git checkout master &>/dev/null
74+
git checkout -f master &>/dev/null
7575

7676
${MVN_BIN} clean package dependency:build-classpath -DskipTests 2>/dev/null | \
7777
sed -n -e '/Building Spark Project Assembly/,$p' | \

0 commit comments

Comments
 (0)