Skip to content

Commit

Permalink
[SPARK-10359][PROJECT-INFRA] Multiple fixes to dev/test-dependencies.…
Browse files Browse the repository at this point in the history
…sh script

This patch includes multiple fixes for the `dev/test-dependencies.sh` script (which was introduced in apache#10461):

- Use `build/mvn --force` instead of `mvn` in one additional place.
- Explicitly set a zero exit code on success.
- Set `LC_ALL=C` to make `sort` results agree across machines (see https://stackoverflow.com/questions/28881/).
- Set `should_run_build_tests=True` for `build` module (this somehow got lost).

Author: Josh Rosen <[email protected]>

Closes apache#10543 from JoshRosen/dep-script-fixes.
  • Loading branch information
JoshRosen committed Jan 10, 2016
1 parent f97d4d5 commit e1ab044
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
3 changes: 2 additions & 1 deletion dev/sparktestsupport/modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,8 @@ def contains_file(self, filename):
source_file_regexes=[
".*pom.xml",
"dev/test-dependencies.sh",
]
],
should_run_build_tests=True
)

ec2 = Module(
Expand Down
8 changes: 7 additions & 1 deletion dev/test-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ set -e
FWDIR="$(cd "`dirname $0`"/..; pwd)"
cd "$FWDIR"

# Explicitly set locale in order to make `sort` output consistent across machines.
# See https://stackoverflow.com/questions/28881 for more details.
export LC_ALL=C

# TODO: This would be much nicer to do in SBT, once SBT supports Maven-style resolution.

MVN="build/mvn --force"
Expand All @@ -38,7 +42,7 @@ HADOOP_PROFILES=(
# resolve Spark's internal submodule dependencies.

# See http://stackoverflow.com/a/3545363 for an explanation of this one-liner:
OLD_VERSION=$(mvn help:evaluate -Dexpression=project.version|grep -Ev '(^\[|Download\w+:)')
OLD_VERSION=$($MVN help:evaluate -Dexpression=project.version|grep -Ev '(^\[|Download\w+:)')
TEMP_VERSION="spark-$(date +%s | tail -c6)"

function reset_version {
Expand Down Expand Up @@ -108,3 +112,5 @@ for HADOOP_PROFILE in "${HADOOP_PROFILES[@]}"; do
exit 1
fi
done

exit 0

0 comments on commit e1ab044

Please sign in to comment.