flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [1/2] flink git commit: [FLINK-5749] [build] Unset HADOOP_HOME and HADOOP_CONF_DIR variables for tests
Date Mon, 20 Feb 2017 13:29:11 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.2 048a21c09 -> e3e3c2a7f


[FLINK-5749] [build] Unset HADOOP_HOME and HADOOP_CONF_DIR variables for tests

This unsets the HADOOP_HOME and HADOOP_CONF_DIR envirobment variables for tests, to avoid
that the tests pick those variable up from build servers and produce unexpected test
results.

This closes #3288


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/24aff09c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/24aff09c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/24aff09c

Branch: refs/heads/release-1.2
Commit: 24aff09ce51a6e90cd6c39d89a3f2c5b7d6f4423
Parents: 048a21c
Author: wenlong.lwl <wenlong.lwl@alibaba-inc.com>
Authored: Fri Jan 13 14:12:17 2017 +0800
Committer: Stephan Ewen <sewen@apache.org>
Committed: Mon Feb 20 12:55:44 2017 +0100

----------------------------------------------------------------------
 .../flink-connector-filesystem/pom.xml            |  6 ++++++
 .../flink-hadoop-compatibility/pom.xml            | 13 +++++++++++++
 flink-fs-tests/pom.xml                            | 18 ++++++++++++++++++
 flink-tests/pom.xml                               |  5 +++++
 4 files changed, 42 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/24aff09c/flink-connectors/flink-connector-filesystem/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
index fbc830a..a582e6d 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -155,6 +155,12 @@ under the License.
 					-->
 					<forkCount>1</forkCount>
 					<reuseForks>false</reuseForks>
+
+					<environmentVariables>
+						<!-- Make sure external hadoop environment will not affect maven building -->
+						<HADOOP_HOME />
+						<HADOOP_CONF_DIR />
+					</environmentVariables>
 				</configuration>
 			</plugin>
 		</plugins>

http://git-wip-us.apache.org/repos/asf/flink/blob/24aff09c/flink-connectors/flink-hadoop-compatibility/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml
index 5938560..9ace671 100644
--- a/flink-connectors/flink-hadoop-compatibility/pom.xml
+++ b/flink-connectors/flink-hadoop-compatibility/pom.xml
@@ -176,6 +176,19 @@ under the License.
 					<configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
 				</configuration>
 			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<environmentVariables>
+						<!-- Make sure external hadoop environment will not affect maven building -->
+						<HADOOP_HOME />
+						<HADOOP_CONF_DIR />
+					</environmentVariables>
+				</configuration>
+			</plugin>
+
 		</plugins>
 	</build>
 

http://git-wip-us.apache.org/repos/asf/flink/blob/24aff09c/flink-fs-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index f480608..31fee49 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -96,4 +96,22 @@ under the License.
 			<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
 		</dependency>
 	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<environmentVariables>
+						<!-- Make sure external hadoop environment will not affect maven building -->
+						<HADOOP_HOME />
+						<HADOOP_CONF_DIR />
+					</environmentVariables>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+
 </project>

http://git-wip-us.apache.org/repos/asf/flink/blob/24aff09c/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index 7929e27..57ec3b6 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -345,6 +345,11 @@ under the License.
 						<classpathDependencyExclude>org.apache.curator:curator-framework</classpathDependencyExclude>
 					</classpathDependencyExcludes>
 					<reuseForks>false</reuseForks>
+					<environmentVariables>
+						<!-- Make sure external hadoop environment will not affect maven building -->
+						<HADOOP_HOME />
+						<HADOOP_CONF_DIR />
+					</environmentVariables>
 				</configuration>
 			</plugin>
 


Mime
View raw message