You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by jo...@apache.org on 2017/05/12 09:17:32 UTC

zeppelin git commit: Revert "[ZEPPELIN-2467] Restoring second travis job functionality"

Repository: zeppelin
Updated Branches:
  refs/heads/master 4668da159 -> 8194a5e0a


Revert "[ZEPPELIN-2467] Restoring second travis job functionality"

This reverts commit 15ecbb49db17f3938ca0b4d584193354ff243429.


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/8194a5e0
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/8194a5e0
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/8194a5e0

Branch: refs/heads/master
Commit: 8194a5e0af0e1b926b27ea9e0d12bdf9d0e43b4b
Parents: 4668da1
Author: Jongyoul Lee <jo...@apache.org>
Authored: Fri May 12 18:15:19 2017 +0900
Committer: Jongyoul Lee <jo...@apache.org>
Committed: Fri May 12 18:15:19 2017 +0900

----------------------------------------------------------------------
 .travis.yml | 9 +--------
 pom.xml     | 6 ------
 2 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8194a5e0/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d6887ef..6130509 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,15 +46,8 @@ matrix:
       env: SCALA_VER="2.11" SPARK_VER="2.0.2" HADOOP_VER="2.6" PROFILE="-Prat" BUILD_FLAG="clean" TEST_FLAG="org.apache.rat:apache-rat-plugin:check" TEST_PROJECTS=""
 
     # Test core modules
-    #
-    # Several tests were excluded from this configuration due to the following issues:
-    # HeliumBundleFactoryTest      - https://issues.apache.org/jira/browse/ZEPPELIN-2469
-    # HeliumApplicationFactoryTest - https://issues.apache.org/jira/browse/ZEPPELIN-2470
-    # NotebookTest                 - https://issues.apache.org/jira/browse/ZEPPELIN-2471
-    # ZeppelinRestApiTest          - https://issues.apache.org/jira/browse/ZEPPELIN-2473
-    # After issues are fixed these tests need to be included back by removing them from the "-Dtests.to.exclude" property
     - jdk: "oraclejdk7"
-      env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_PROJECTS="-Dtests.to.exclude=**/ZeppelinSparkClusterTest.java,**/org.apache.zeppelin.spark.*,**/HeliumBundleFactoryTest.java,**/HeliumApplicationFactoryTest.java,**/NotebookTest.java,**/ZeppelinRestApiTest.java -DfailIfNoTests=false"
+      env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Pweb-ci -Pscalding -Phelium-dev -Pexamples -Pscala-2.11" BUILD_FLAG="package -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_PROJECTS="-Dtest='!ZeppelinSparkClusterTest,!org.apache.zeppelin.spark.*' -DfailIfNoTests=false"
 
     # Test selenium with spark module for 1.6.3
     - jdk: "oraclejdk7"

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/8194a5e0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 87af323..3bede62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,9 +134,6 @@
 
     <PermGen>64m</PermGen>
     <MaxPermGen>512m</MaxPermGen>
-
-    <!-- to be able to exclude some tests using command line -->
-    <tests.to.exclude/>
   </properties>
 
   <dependencyManagement>
@@ -558,9 +555,6 @@
           <version>${plugin.surefire.version}</version>
           <configuration combine.children="append">
             <argLine>-Xmx2g -Xms1g -Dfile.encoding=UTF-8</argLine>
-            <excludes>
-              <exclude>${tests.to.exclude}</exclude>
-            </excludes>
           </configuration>
           <!-- <excludes> <exclude>**/itest/**</exclude> </excludes> <executions>
             <execution> <id>surefire-itest</id> <phase>integration-test</phase> <goals>