Skip to content

Commit a18db71

Browse files
author
Brennon York
committed
full test of new deps script
1 parent ea170de commit a18db71

File tree

2 files changed

+11
-23
lines changed

2 files changed

+11
-23
lines changed

dev/run-tests-jenkins

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,7 @@ for t in "${PR_TESTS[@]}"; do
158158
# Ensure the test can be found and is a file
159159
if [ -f "${this_test}" ]; then
160160
echo "Running test: $t"
161-
this_mssg="$(bash -x "${this_test}" "${ghprbActualCommit}" "${sha1}")"
162-
# Check the return value from the test to ensure it exited properly
163-
#[ $? > 0 ] && \
164-
# echo "Error while running test: $t" && \
165-
# continue
161+
this_mssg="$(bash "${this_test}" "${ghprbActualCommit}" "${sha1}")"
166162
# Check if this is the merge test as we submit that note *before* and *after*
167163
# the tests run
168164
[ "$t" == "pr_merge_ability" ] && merge_note="${this_mssg}"

dev/tests/pr_new_dependencies.sh

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,20 @@
3131
ghprbActualCommit="$1"
3232
sha1="$2"
3333

34-
set -e
35-
3634
MVN_BIN="`pwd`/build/mvn"
3735
CURR_CP_FILE="my-classpath.txt"
3836
MASTER_CP_FILE="master-classpath.txt"
3937

40-
${MVN_BIN} clean package dependency:build-classpath -DskipTests 2>/dev/null
41-
42-
#${MVN_BIN} clean package dependency:build-classpath 2>/dev/null | \
43-
# sed -n -e '/Building Spark Project Assembly/,$p' | \
44-
# grep --context=1 -m 2 "Dependencies classpath:" | \
45-
# head -n 3 | \
46-
# tail -n 1 | \
47-
# tr ":" "\n" | \
48-
# rev | \
49-
# cut -d "/" -f 1 | \
50-
# rev | \
51-
# sort > ${CURR_CP_FILE}
38+
${MVN_BIN} clean package dependency:build-classpath -DskipTests 2>/dev/null | \
39+
sed -n -e '/Building Spark Project Assembly/,$p' | \
40+
grep --context=1 -m 2 "Dependencies classpath:" | \
41+
head -n 3 | \
42+
tail -n 1 | \
43+
tr ":" "\n" | \
44+
rev | \
45+
cut -d "/" -f 1 | \
46+
rev | \
47+
sort > ${CURR_CP_FILE}
5248

5349
# Checkout the master branch to compare against
5450
git checkout master &>/dev/null
@@ -93,7 +89,3 @@ fi
9389

9490
# Clean up our mess from the Maven builds just in case
9591
${MVN_BIN} clean &>/dev/null
96-
97-
set +e
98-
99-
exit 0

0 commit comments

Comments
 (0)