You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2016/02/18 07:49:03 UTC
ambari git commit: AMBARI-15081: Ambari functional tests: Build
issues - tests should not run during regular build; JAR file not required.
Repository: ambari
Updated Branches:
refs/heads/trunk dcebcca60 -> 84ca6a88d
AMBARI-15081: Ambari functional tests: Build issues - tests should not run during regular build; JAR file not required.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/84ca6a88
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/84ca6a88
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/84ca6a88
Branch: refs/heads/trunk
Commit: 84ca6a88d0ba80011394a0ab767a80c7e342aa3c
Parents: dcebcca
Author: Nahappan Somasundaram <ns...@hortonworks.com>
Authored: Wed Feb 17 18:00:07 2016 -0800
Committer: Nahappan Somasundaram <ns...@hortonworks.com>
Committed: Wed Feb 17 22:39:49 2016 -0800
----------------------------------------------------------------------
ambari-funtest/pom.xml | 16 +----
ambari-funtest/src/main/assemblies/empty.xml | 22 ++++++
ambari-funtest/src/main/assemblies/funtest.xml | 79 ---------------------
3 files changed, 24 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/84ca6a88/ambari-funtest/pom.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml
index 8d19631..28225c2 100644
--- a/ambari-funtest/pom.xml
+++ b/ambari-funtest/pom.xml
@@ -22,9 +22,6 @@
<packaging>${packagingFormat}</packaging>
<name>Ambari Functional Tests</name>
<description>Ambari Functional Tests</description>
- <properties>
- <maven.test.skip>true</maven.test.skip> <!-- Don't run tests by default. Run with -Dmaven.test.skip=false to run tests -->
- </properties>
<build>
<plugins>
<plugin>
@@ -62,15 +59,6 @@
<forkMode>once</forkMode>
</configuration>
<executions>
- <!-- Will display BUILD SUCCESSFUL if build is successful.
- Does not matter if the tests fail -->
- <execution>
- <id>run-integration-tests</id>
- <phase>test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
<!-- Will display BUILD FAILURE if build fails or any test fails -->
<execution>
<id>run-verify</id>
@@ -128,7 +116,7 @@
<executable.shell>sh</executable.shell>
<fileextension.shell>sh</fileextension.shell>
<fileextension.dot.shell-default></fileextension.dot.shell-default>
- <assemblydescriptor>src/main/assemblies/funtest.xml</assemblydescriptor>
+ <assemblydescriptor>src/main/assemblies/empty.xml</assemblydescriptor>
<packagingFormat>jar</packagingFormat>
</properties>
</profile>
@@ -146,7 +134,7 @@
<executable.shell>cmd</executable.shell>
<fileextension.shell>cmd</fileextension.shell>
<fileextension.dot.shell-default></fileextension.dot.shell-default>
- <assemblydescriptor>src/main/assemblies/funtest.xml</assemblydescriptor>
+ <assemblydescriptor>src/main/assemblies/empty.xml</assemblydescriptor>
<packagingFormat>jar</packagingFormat>
</properties>
</profile>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84ca6a88/ambari-funtest/src/main/assemblies/empty.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/main/assemblies/empty.xml b/ambari-funtest/src/main/assemblies/empty.xml
new file mode 100644
index 0000000..9226f2c
--- /dev/null
+++ b/ambari-funtest/src/main/assemblies/empty.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<assembly>
+ <id>empty</id>
+ <formats/>
+</assembly>
http://git-wip-us.apache.org/repos/asf/ambari/blob/84ca6a88/ambari-funtest/src/main/assemblies/funtest.xml
----------------------------------------------------------------------
diff --git a/ambari-funtest/src/main/assemblies/funtest.xml b/ambari-funtest/src/main/assemblies/funtest.xml
deleted file mode 100644
index 93d2e17..0000000
--- a/ambari-funtest/src/main/assemblies/funtest.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<assembly>
- <id>dist</id>
- <formats>
- <format>dir</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>false</includeBaseDirectory>
- <files>
- <file>
- <source>${project.build.directory}/${artifact.artifactId}-${artifact.version}.jar</source>
- <outputDirectory>ambari-funtest-${project.version}/lib/ambari-funtest</outputDirectory>
- </file>
- </files>
- <fileSets>
- <!-- Distro files, readme, licenses, etc -->
- <fileSet>
- <directory>${basedir}/../</directory>
- <outputDirectory>ambari-funtest-${project.version}/</outputDirectory>
- <includes>
- <include>*.txt</include>
- </includes>
- </fileSet>
- <!--
- <fileSet>
- <directory>${basedir}/src/main/bin</directory>
- <outputDirectory>ambari-funtest-${project.version}/bin</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- <fileMode>0755</fileMode>
- </fileSet>
- -->
- <fileSet>
- <directory>${basedir}/src/main/resources/</directory>
- <outputDirectory>/ambari-funtest-${project.version}/keystore</outputDirectory>
- <includes>
- <include>db/*</include>
- <include>ca.config</include>
- <include>pass.txt</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${basedir}/../ambari-web/public</directory>
- <outputDirectory>ambari-funtest-${project.version}/web</outputDirectory>
- <includes>
- <include>**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/conf</directory>
- <outputDirectory>/ambari-funtest-${project.version}/etc/ambari-funtest/conf</outputDirectory>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>ambari-funtest-${project.version}/lib/ambari-funtest</outputDirectory>
- <unpack>false</unpack>
- <scope>compile</scope>
- </dependencySet>
- </dependencySets>
-</assembly>