This is an automated email from the ASF dual-hosted git repository.
jongyoul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 8a83545b82 [ZEPPELIN-5815] Frontend CI jobs improvement (#4498)
8a83545b82 is described below
commit 8a83545b8282b8d3e9de3f401bbdcfa750902484
Author: Guanhua Li <guanhua...@foxmail.com>
AuthorDate: Wed Nov 2 11:40:29 2022 +0800
[ZEPPELIN-5815] Frontend CI jobs improvement (#4498)
* disable enforcer plugin
* not verify all
* VERIFY TWO JOB
* Add test dependencies for `zeppelin-web` . Change the scope of
dependencies in `zeppelin-web` and `zeppelin-integration` to test.
* adjustment
* use scala profile
* Add web-dist profile
* Use scala profile in zeppelin-integration
* Enable using-source-tree
Co-authored-by: Philipp Dallig <philipp.dal...@gmail.com>
---
.github/workflows/frontend.yml | 11 ++--
zeppelin-integration/pom.xml | 114 ++++++++++++++++++++++++++++++++++++-----
zeppelin-web/pom.xml | 85 ++++++++++++++++++++++++++++++
3 files changed, 192 insertions(+), 18 deletions(-)
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
index a3a04e309c..28750fce84 100644
--- a/.github/workflows/frontend.yml
+++ b/.github/workflows/frontend.yml
@@ -49,9 +49,9 @@ jobs:
restore-keys: |
${{ runner.os }}-zeppelin-
- name: Install application
- run: ./mvnw -B install -DskipTests -DskipRat -pl ${INTERPRETERS}
-Phadoop2 -Pscala-2.11
+ run: ./mvnw clean install -DskipTests -DskipRat -am -pl zeppelin-web
-Pscala-2.11 -Pspark-scala-2.11 -Pspark-2.4 -Phadoop2 -Pweb-dist -B
- name: Run headless test
- run: xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24"
./mvnw verify -DskipRat -pl zeppelin-web -Pscala-2.11 -Pweb-e2e -B
+ run: xvfb-run --auto-servernum --server-args="-screen 0 1024x768x24"
./mvnw verify -DskipRat -pl zeppelin-web -Pscala-2.11 -Pspark-scala-2.11
-Pspark-2.4 -Phadoop2 -Pweb-dist -Pweb-e2e -B
- name: Print zeppelin logs
if: always()
run: if [ -d "logs" ]; then cat logs/*; fi
@@ -122,13 +122,12 @@ jobs:
- name: Make IRkernel available to Jupyter
run: |
R -e "IRkernel::installspec()"
- - name: install environment
+ - name: Install Environment
run: |
- ./mvnw clean install -DskipTests -DskipRat -pl ${INTERPRETERS}
-Pspark-2.4 -Phadoop2 -Phelium-dev -Pexamples -Pintegration -Pspark-scala-2.11
-B
- ./mvnw clean package -pl zeppelin-plugins -amd -B
+ ./mvnw clean install -DskipTests -DskipRat -am -pl
zeppelin-integration -Pintegration -Pspark-scala-2.11 -Pspark-2.4 -Phadoop2
-Pweb-dist -B
- name: run tests
run: |
- source ./testing/downloadSpark.sh "2.4.7" "2.7" && echo "SPARK_HOME:
${SPARK_HOME}" && xvfb-run --auto-servernum --server-args="-screen 0
1600x1024x16" ./mvnw verify -DskipRat -Pspark-2.4 -Phadoop2 -Phelium-dev
-Pexamples -Pintegration -Pspark-scala-2.11 -B -pl zeppelin-integration
-DfailIfNoTests=false
+ source ./testing/downloadSpark.sh "2.4.7" "2.7" && echo "SPARK_HOME:
${SPARK_HOME}" && xvfb-run --auto-servernum --server-args="-screen 0
1600x1024x16" ./mvnw verify -DskipRat -DfailIfNoTests=false -pl
zeppelin-integration -Pintegration -Pspark-scala-2.11 -Pspark-2.4 -Phadoop2
-Pweb-dist -Pusing-source-tree -B
- name: Print zeppelin logs
if: always()
run: if [ -d "logs" ]; then cat logs/*; fi
diff --git a/zeppelin-integration/pom.xml b/zeppelin-integration/pom.xml
index 15d9907339..0eb831e268 100644
--- a/zeppelin-integration/pom.xml
+++ b/zeppelin-integration/pom.xml
@@ -74,6 +74,22 @@
</exclusions>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.rauschig</groupId>
+ <artifactId>jarchivelib</artifactId>
+ <version>0.7.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>zeppelin-zengine</artifactId>
@@ -94,21 +110,49 @@
</exclusions>
<scope>test</scope>
</dependency>
-
+
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-interpreter</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.rauschig</groupId>
- <artifactId>jarchivelib</artifactId>
- <version>0.7.1</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-shell</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-angular</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-markdown</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-python</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-web</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<!--test libraries-->
@@ -117,6 +161,7 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
+
</dependencies>
<build>
@@ -187,6 +232,15 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
@@ -213,6 +267,42 @@
</zeppelin.daemon.package.base>
</properties>
</profile>
+ <!-- Include some test dependencies depending on the spark-scala profile
-->
+ <profile>
+ <id>spark-scala-2.13</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-scala-2.13</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>spark-scala-2.12</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-scala-2.12</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>spark-scala-2.11</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-scala-2.11</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
diff --git a/zeppelin-web/pom.xml b/zeppelin-web/pom.xml
index fb36fca7fb..eba9d1dbc4 100644
--- a/zeppelin-web/pom.xml
+++ b/zeppelin-web/pom.xml
@@ -41,6 +41,45 @@
<plugin.frontend.npmDownloadRoot>https://registry.npmjs.org/npm/-/</plugin.frontend.npmDownloadRoot>
</properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-interpreter</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-shell</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-angular</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-markdown</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-python</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-server</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
<build>
<plugins>
<plugin>
@@ -205,6 +244,16 @@
<artifactId>maven-resources-plugin</artifactId>
</plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>enforce</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+
</plugins>
</build>
@@ -232,6 +281,42 @@
<web.e2e.enabled>true</web.e2e.enabled>
</properties>
</profile>
+ <!-- Include some test dependencies depending on the spark-scala profile
-->
+ <profile>
+ <id>spark-scala-2.13</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-scala-2.13</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>spark-scala-2.12</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-scala-2.12</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>spark-scala-2.11</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
+ <artifactId>spark-scala-2.11</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
