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

zeppelin git commit: [ZEPPELIN-2467] Restore travis second job functionality

Repository: zeppelin
Updated Branches:
  refs/heads/master fcd3aa75c -> 9cf09cce8


[ZEPPELIN-2467] Restore travis second job functionality

### What is this PR for?
issue ZEPPELIN-2467 has resolved by https://github.com/apache/zeppelin/pull/2300. However https://github.com/apache/zeppelin/commit/8194a5e0af0e1b926b27ea9e0d12bdf9d0e43b4b reverts #2300.

This PR apply #2300 again with two more test exclusion:
  - SecurityRestApiTest (https://issues.apache.org/jira/browse/ZEPPELIN-2545)
  - NotebookSecurityRestApiTest (https://issues.apache.org/jira/browse/ZEPPELIN-2546)

### What type of PR is it?
Bug Fix

### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-2467

### How should this be tested?
CI becomes green

### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no

Author: Alexander Shoshin <Al...@epam.com>
Author: Lee moon soo <mo...@apache.org>

Closes #2342 from Leemoonsoo/fix_ci2 and squashes the following commits:

1a8f24b [Lee moon soo] exclude SecurityRestApiTest and NotebookSecurityRestApiTest
4f82243 [Alexander Shoshin] made a comment about excluded tests
95eb7be [Alexander Shoshin] changed -Dtest flag to -Dtests.to.exclude and excluded unstable tests
41af70f [Alexander Shoshin] added ability to exclude some unit tests using command line


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

Branch: refs/heads/master
Commit: 9cf09cce87d529f086c3560db230b6bfac9042d0
Parents: fcd3aa7
Author: Alexander Shoshin <Al...@epam.com>
Authored: Sun May 14 18:05:41 2017 -0400
Committer: Lee moon soo <mo...@apache.org>
Committed: Wed May 17 14:47:48 2017 -0400

----------------------------------------------------------------------
 .travis.yml | 11 ++++++++++-
 pom.xml     |  6 ++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9cf09cce/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 6130509..1a38468 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -46,8 +46,17 @@ 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
+    # SecurityRestApiTest          - https://issues.apache.org/jira/browse/ZEPPELIN-2545
+    # NotebookSecurityRestApiTest  - https://issues.apache.org/jira/browse/ZEPPELIN-2546
+    # 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="-Dtest='!ZeppelinSparkClusterTest,!org.apache.zeppelin.spark.*' -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="-Dtests.to.exclude=**/ZeppelinSparkClusterTest.java,**/org.apache.zeppelin.spark.*,**/HeliumBundleFactoryTest.java,**/HeliumApplicationFactoryTest.java,**/NotebookTest.java,**/ZeppelinRestApiTest.java,**/SecurityRestApiTest.java,**/NotebookSecurityRestApiTest.java -DfailIfNoTests=false"
 
     # Test selenium with spark module for 1.6.3
     - jdk: "oraclejdk7"

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/9cf09cce/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3bede62..87af323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -134,6 +134,9 @@
 
     <PermGen>64m</PermGen>
     <MaxPermGen>512m</MaxPermGen>
+
+    <!-- to be able to exclude some tests using command line -->
+    <tests.to.exclude/>
   </properties>
 
   <dependencyManagement>
@@ -555,6 +558,9 @@
           <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>