From f90deb4bf3db57e36232c9c94ae3b07dfd7c2331 Mon Sep 17 00:00:00 2001
From: 1ambda <1amb4a@gmail.com>
Date: Tue, 11 Jul 2017 01:53:11 +0900
Subject: [PATCH] chore: Move web e2e into zeppelin-web

---
 .travis.yml             |  2 +-
 zeppelin-server/pom.xml | 37 ---------------------
 zeppelin-web/pom.xml    | 72 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 73 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fe6adb3755..7f200b0567 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ matrix:
 
     # Run e2e tests (in zeppelin-web)
     - jdk: "oraclejdk7"
-      env: WEB_E2E="true" SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Pweb-ci -Pweb-e2e -Pscala-2.11" BUILD_FLAG="package -DskipTests -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_MODULES="-pl !spark,!spark-dependencies,!zeppelin-web,!zeppelin-jupyter,!zeppelin-distribution" TEST_PROJECTS="-Dtests.to.exclude=**/org/apache/zeppelin/**/*.java -DtagsToInclude=None -DfailIfNoTests=false"
+      env: WEB_E2E="true" SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Pweb-ci -Pweb-e2e -Pscala-2.11" BUILD_FLAG="package -DskipTests -Pbuild-distr -DskipRat" TEST_FLAG="verify -Pusing-packaged-distr -DskipRat" MODULES="-pl ${INTERPRETERS}" TEST_MODULES="-pl zeppelin-web"  TEST_PROJECTS=""
 
     # Test core modules
     # Several tests were excluded from this configuration due to the following issues:
diff --git a/zeppelin-server/pom.xml b/zeppelin-server/pom.xml
index e57b176442..121278d57b 100644
--- a/zeppelin-server/pom.xml
+++ b/zeppelin-server/pom.xml
@@ -38,7 +38,6 @@
   </prerequisites>
 
   <properties>
-    <web.e2e.disabled>true</web.e2e.disabled>
 
     <!--library versions-->
     <commons.httpclient.version>4.3.6</commons.httpclient.version>
@@ -434,35 +433,6 @@
         </executions>
       </plugin>
 
-      <!-- IMPORTANT: frontend-maven-plugin should be placed before maven-antrun-plugin
-                      so that browser-side integration test can run before stopping zeppelin daemon -->
-      <plugin>
-        <groupId>com.github.eirslett</groupId>
-        <artifactId>frontend-maven-plugin</artifactId>
-        <version>${plugin.frontned.version}</version>
-
-        <executions>
-          <execution>
-            <id>yarn e2e</id>
-            <goals>
-              <goal>yarn</goal>
-            </goals>
-            <phase>integration-test</phase>
-            <configuration>
-              <arguments>run e2e</arguments>
-            </configuration>
-          </execution>
-        </executions>
-
-          <configuration>
-            <skip>${web.e2e.disabled}</skip>
-            <!-- use existing yarn -->
-            <workingDirectory>${project.parent.basedir}/zeppelin-web</workingDirectory>
-          </configuration>
-      </plugin>
-
-      <!-- IMPORTANT: maven-antrun-plugin should be placed after frontend-maven-plugin
-                      so that stopping zeppelin daemon after executing browser-side integration test -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
@@ -526,13 +496,6 @@
       </properties>
     </profile>
 
-    <profile>
-      <id>web-e2e</id>
-      <properties>
-        <web.e2e.disabled>false</web.e2e.disabled>
-      </properties>
-    </profile>
-
     <profile>
       <id>using-packaged-distr</id>
       <activation>
diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml
index ab00faadfd..c2f91f7da9 100644
--- a/zeppelin-web/pom.xml
+++ b/zeppelin-web/pom.xml
@@ -38,6 +38,8 @@
   </prerequisites>
 
   <properties>
+    <web.e2e.disabled>true</web.e2e.disabled>
+    <zeppelin.daemon.package.base>../bin</zeppelin.daemon.package.base>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
@@ -102,6 +104,56 @@
             </configuration>
           </execution>
 
+            <execution>
+              <id>yarn e2e</id>
+              <goals>
+                <goal>yarn</goal>
+              </goals>
+              <phase>integration-test</phase>
+              <configuration>
+                <skip>${web.e2e.disabled}</skip>
+                <arguments>run e2e</arguments>
+              </configuration>
+            </execution>
+
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>start-zeppelin</id>
+            <phase>pre-integration-test</phase>
+            <configuration>
+              <skip>${web.e2e.disabled}</skip>
+              <target unless="skipTests">
+                <exec executable="./zeppelin-daemon.sh" dir="${zeppelin.daemon.package.base}" spawn="true">
+                  <arg value="start" />
+                </exec>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+
+          <execution>
+            <id>stop-zeppelin</id>
+            <phase>post-integration-test</phase>
+            <configuration>
+              <skip>${web.e2e.disabled}</skip>
+              <target unless="skipTests">
+                <exec executable="./zeppelin-daemon.sh" dir="${zeppelin.daemon.package.base}" spawn="false">
+                  <arg value="stop" />
+                </exec>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
         </executions>
       </plugin>
 
@@ -164,6 +216,26 @@
         <web.build.command>run build:ci</web.build.command>
       </properties>
     </profile>
+
+    <profile>
+      <id>web-e2e</id>
+      <properties>
+        <web.e2e.disabled>false</web.e2e.disabled>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>using-packaged-distr</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <properties>
+        <zeppelin.daemon.package.base>
+          ../zeppelin-distribution/target/zeppelin-${project.version}/zeppelin-${project.version}/bin
+        </zeppelin.daemon.package.base>
+      </properties>
+    </profile>
+
   </profiles>