zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cornead...@apache.org
Subject incubator-zeppelin git commit: Propagate maven -DskipTests option to WebApp
Date Wed, 03 Feb 2016 18:53:28 GMT
Repository: incubator-zeppelin
Updated Branches:
  refs/heads/master 1940388e3 -> a4e81ade6


Propagate maven -DskipTests option to WebApp

### What is this PR for?
This PR has for goal to help people build Zeppelin when phantomJS is not working properly
on their machine:
* [Some Problems Here](https://mail-archives.apache.org/mod_mbox/incubator-zeppelin-users/201509.mbox/%3CCAKhwvQtTCDeXaQOhpu+wvxPj1io4ra+dG=mEQE7eVR5xboB8eAmail.gmail.com%3E)
* [Here Too](https://mail-archives.apache.org/mod_mbox/incubator-zeppelin-users/201511.mbox/%3CCABePtM3iMeWayAqOzeDahcL-Bz8A3uXUqSuMU41dehWXMd_vmAmail.gmail.com%3E)
* And more

Currently, you have to edit some code in order to bypass the test launched by grunt, and it
doesn't seem right for `-DskipTests` to no skip the WebApp tests.

In order to apply that rule, we need to bump the version of `frontend-maven-plugin` to 0.0.25.
Sadly they do not have a changelog, so we need to make sure everything is alright.

### What type of PR is it?
Improvement

### Is there a relevant Jira issue?
Related: https://issues.apache.org/jira/browse/ZEPPELIN-403
https://issues.apache.org/jira/browse/ZEPPELIN-644

### How should this be tested?
* You should clear your bower cache, since we changed a dependency version.
* Run `mvn package` inside zeppelin-web folder and assess that the test were ran
```
Running "karma:unit" (karma) task
[INFO] INFO [karma]: Karma v0.12.37 server started at http://localhost:9002/
[INFO] INFO [launcher]: Starting browser PhantomJS
[INFO] INFO [PhantomJS 1.9.8 (Mac OS X 0.0.0)]: Connected on socket OHBv4N47NmnKdZx9YUm7 with
id 61917714
       PhantomJS 1.9.8 (Mac OS X 0.0.0): Executed 37 of 82 SUCCESS (0 secs / 0.249 secs)
       PhantomJS 1.9.8 (Mac OS X 0.0.0): Executed 82 of 82 SUCCESS (0.578 secs / 0.562 secs)
```
* Run `mvn package -DskipTests` and assess that PhantomJS didnt run

### Questions:
* Does the licenses files need update? No, its wasn't listed originally
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Damien CORNEAU <corneadoug@gmail.com>

Closes #682 from corneadoug/fix/skipTestsOnWebApp and squashes the following commits:

3d0c710 [Damien CORNEAU] Change frontend-maven-plugin conf & version to propagate skipTests
to webApp


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

Branch: refs/heads/master
Commit: a4e81ade615f7957d5ce0669fb2a3860f1492e3d
Parents: 1940388
Author: Damien CORNEAU <corneadoug@gmail.com>
Authored: Mon Feb 1 16:31:47 2016 -0800
Committer: Damien CORNEAU <corneadoug@gmail.com>
Committed: Wed Feb 3 10:53:14 2016 -0800

----------------------------------------------------------------------
 zeppelin-web/Gruntfile.js | 16 ----------------
 zeppelin-web/pom.xml      | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a4e81ade/zeppelin-web/Gruntfile.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/Gruntfile.js b/zeppelin-web/Gruntfile.js
index 13612ea..b865f02 100644
--- a/zeppelin-web/Gruntfile.js
+++ b/zeppelin-web/Gruntfile.js
@@ -434,22 +434,6 @@ module.exports = function (grunt) {
   ]);
 
   grunt.registerTask('build', [
-    'test',
-    'clean:dist',
-    'wiredep',
-    'useminPrepare',
-    'concurrent:dist',
-    'postcss',
-    'concat',
-    'ngAnnotate',
-    'copy:dist',
-    'cssmin',
-    'uglify',
-    'usemin',
-    'htmlmin'
-  ]);
-
-  grunt.registerTask('buildSkipTests', [
     'clean:dist',
     'wiredep',
     'useminPrepare',

http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/a4e81ade/zeppelin-web/pom.xml
----------------------------------------------------------------------
diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml
index 6b278af..38d87f3 100644
--- a/zeppelin-web/pom.xml
+++ b/zeppelin-web/pom.xml
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>com.github.eirslett</groupId>
         <artifactId>frontend-maven-plugin</artifactId>
-        <version>0.0.23</version>
+        <version>0.0.25</version>
         <executions>
 
           <execution>
@@ -122,11 +122,22 @@
             <goals>
               <goal>grunt</goal>
             </goals>
+            <configuration>
+              <arguments>build</arguments>
+            </configuration>
+          </execution>
 
+          <execution>
+            <id>grunt test</id>
+            <goals>
+              <goal>grunt</goal>
+            </goals>
+            <phase>test</phase>
             <configuration>
-              <arguments>--no-color</arguments>
+              <arguments>test</arguments>
             </configuration>
           </execution>
+
         </executions>
       </plugin>
 


Mime
View raw message