This is an automated email from the ASF dual-hosted git repository.
shaneknapp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 84d4f94 [SPARK-28701][INFRA][FOLLOWUP] Fix the key error when looking
in os.environ
84d4f94 is described below
commit 84d4f945969e199a5d3fb658864e494b88d15f3c
Author: shane knapp <[email protected]>
AuthorDate: Mon Aug 26 12:40:31 2019 -0700
[SPARK-28701][INFRA][FOLLOWUP] Fix the key error when looking in os.environ
### What changes were proposed in this pull request?
i broke run-tests.py for non-PRB builds in this PR:
https://github.com/apache/spark/pull/25423
### Why are the changes needed?
to fix what i broke
### Does this PR introduce any user-facing change?
no
### How was this patch tested?
the build system will test this
Closes #25585 from shaneknapp/fix-run-tests.
Authored-by: shane knapp <[email protected]>
Signed-off-by: shane knapp <[email protected]>
---
dev/run-tests.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/dev/run-tests.py b/dev/run-tests.py
index a338667..ea51570 100755
--- a/dev/run-tests.py
+++ b/dev/run-tests.py
@@ -405,10 +405,11 @@ def run_scala_tests(build_tool, hadoop_version,
test_modules, excluded_tags):
test_profiles += ['-Dtest.exclude.tags=' + ",".join(excluded_tags)]
# set up java11 env if this is a pull request build with 'test-java11' in
the title
- if "test-java11" in os.environ["ghprbPullTitle"].lower():
- os.environ["JAVA_HOME"] = "/usr/java/jdk-11.0.1"
- os.environ["PATH"] = "%s/bin:%s" % (os.environ["JAVA_HOME"],
os.environ["PATH"])
- test_profiles += ['-Djava.version=11']
+ if "ghprbPullTitle" in os.environ:
+ if "test-java11" in os.environ["ghprbPullTitle"].lower():
+ os.environ["JAVA_HOME"] = "/usr/java/jdk-11.0.1"
+ os.environ["PATH"] = "%s/bin:%s" % (os.environ["JAVA_HOME"],
os.environ["PATH"])
+ test_profiles += ['-Djava.version=11']
if build_tool == "maven":
run_scala_tests_maven(test_profiles)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
