Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
spark
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs525-sp18-g07
spark
Commits
c63036cd
Commit
c63036cd
authored
9 years ago
by
Patrick Wendell
Browse files
Options
Downloads
Patches
Plain Diff
Revert "[BUILD] Always run SQL tests in master build."
This reverts commit
147b6be3
.
parent
f490b3b4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dev/run-tests
+17
-24
17 additions, 24 deletions
dev/run-tests
dev/run-tests-jenkins
+0
-2
0 additions, 2 deletions
dev/run-tests-jenkins
with
17 additions
and
26 deletions
dev/run-tests
+
17
−
24
View file @
c63036cd
...
...
@@ -82,31 +82,24 @@ export SBT_MAVEN_PROFILES_ARGS="$SBT_MAVEN_PROFILES_ARGS -Pkinesis-asl"
if
[
-n
"
$AMPLAB_JENKINS
"
]
;
then
git fetch origin master:master
# AMP_JENKINS_PRB indicates if the current build is a pull request build.
if
[
-n
"
$AMP_JENKINS_PRB
"
]
;
then
# It is a pull request build.
sql_diffs
=
$(
git diff
--name-only
master
\
|
grep
-e
"^sql/"
-e
"^bin/spark-sql"
-e
"^sbin/start-thriftserver.sh"
)
non_sql_diffs
=
$(
git diff
--name-only
master
\
|
grep
-v
-e
"^sql/"
-e
"^bin/spark-sql"
-e
"^sbin/start-thriftserver.sh"
)
if
[
-n
"
$sql_diffs
"
]
;
then
echo
"[info] Detected changes in SQL. Will run Hive test suite."
_RUN_SQL_TESTS
=
true
if
[
-z
"
$non_sql_diffs
"
]
;
then
echo
"[info] Detected no changes except in SQL. Will only run SQL tests."
_SQL_TESTS_ONLY
=
true
fi
fi
else
# It is a regular build. We should run SQL tests.
sql_diffs
=
$(
git diff
--name-only
master
\
|
grep
-e
"^sql/"
-e
"^bin/spark-sql"
-e
"^sbin/start-thriftserver.sh"
)
non_sql_diffs
=
$(
git diff
--name-only
master
\
|
grep
-v
-e
"^sql/"
-e
"^bin/spark-sql"
-e
"^sbin/start-thriftserver.sh"
)
if
[
-n
"
$sql_diffs
"
]
;
then
echo
"[info] Detected changes in SQL. Will run Hive test suite."
_RUN_SQL_TESTS
=
true
if
[
-z
"
$non_sql_diffs
"
]
;
then
echo
"[info] Detected no changes except in SQL. Will only run SQL tests."
_SQL_TESTS_ONLY
=
true
fi
fi
fi
...
...
This diff is collapsed.
Click to expand it.
dev/run-tests-jenkins
+
0
−
2
View file @
c63036cd
...
...
@@ -185,8 +185,6 @@ done
# run tests
{
# Marks this build is a pull request build.
export
AMP_JENKINS_PRB
=
true
timeout
"
${
TESTS_TIMEOUT
}
"
./dev/run-tests
test_result
=
"
$?
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment