From 536fa911c181958d84f14156f7d57ef5fd68df48 Mon Sep 17 00:00:00 2001
From: Sean Owen <sowen@cloudera.com>
Date: Thu, 1 Sep 2016 09:10:01 +0100
Subject: [PATCH] [SPARK-17329][BUILD] Don't build PRs with -Pyarn unless YARN
code changed
## What changes were proposed in this pull request?
Only build PRs with -Pyarn if YARN code was modified.
## How was this patch tested?
Jenkins tests (will look to verify whether -Pyarn was included in the PR builder for this one.)
Author: Sean Owen <sowen@cloudera.com>
Closes #14892 from srowen/SPARK-17329.
---
dev/run-tests.py | 10 +++++-----
dev/sparktestsupport/modules.py | 1 +
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dev/run-tests.py b/dev/run-tests.py
index 930d7f8bd9..ae4b5306fc 100755
--- a/dev/run-tests.py
+++ b/dev/run-tests.py
@@ -305,11 +305,11 @@ def get_hadoop_profiles(hadoop_version):
"""
sbt_maven_hadoop_profiles = {
- "hadoop2.2": ["-Pyarn", "-Phadoop-2.2"],
- "hadoop2.3": ["-Pyarn", "-Phadoop-2.3"],
- "hadoop2.4": ["-Pyarn", "-Phadoop-2.4"],
- "hadoop2.6": ["-Pyarn", "-Phadoop-2.6"],
- "hadoop2.7": ["-Pyarn", "-Phadoop-2.7"],
+ "hadoop2.2": ["-Phadoop-2.2"],
+ "hadoop2.3": ["-Phadoop-2.3"],
+ "hadoop2.4": ["-Phadoop-2.4"],
+ "hadoop2.6": ["-Phadoop-2.6"],
+ "hadoop2.7": ["-Phadoop-2.7"],
}
if hadoop_version in sbt_maven_hadoop_profiles:
diff --git a/dev/sparktestsupport/modules.py b/dev/sparktestsupport/modules.py
index d8e3989ec2..050cdf0437 100644
--- a/dev/sparktestsupport/modules.py
+++ b/dev/sparktestsupport/modules.py
@@ -449,6 +449,7 @@ yarn = Module(
"yarn/",
"common/network-yarn/",
],
+ build_profile_flags=["-Pyarn"],
sbt_test_goals=[
"yarn/test",
"network-yarn/test",
--
GitLab