This is an automated email from the ASF dual-hosted git repository.
jialiang pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 0fe551a5cc AMBARI-26191: Fix Ambari Server Parallel Compilation and
Packaging Issue (#3850)
0fe551a5cc is described below
commit 0fe551a5cc2afb5e68e3c8eaafaa03ce4e6e2105
Author: jialiang <[email protected]>
AuthorDate: Tue Oct 22 08:53:52 2024 +0800
AMBARI-26191: Fix Ambari Server Parallel Compilation and Packaging Issue
(#3850)
* AMBARI-26191: Fix Ambari Server Parallel Compilation and Packaging Issue
---
Jenkinsfile | 18 +++++-----
ambari-admin/pom.xml | 93 +++++++++++++++++++++++++++++----------------------
ambari-server/pom.xml | 5 +++
3 files changed, 67 insertions(+), 49 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 665a56254c..40d3b3cb09 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,13 +94,6 @@ pipeline {
stage('Parallel Unit Tests') {
parallel {
- stage('Ambari WebUI Tests') {
- steps {
- withEnv(['CHROME_BIN=/usr/bin/chromium-browser']) {
- sh 'mvn -T 2C -am test -pl ambari-web,ambari-admin
-Dmaven.artifact.threads=10 -Drat.skip'
- }
- }
- }
stage('Ambari Agent Tests') {
steps {
sh 'pip3 install distro'
@@ -110,14 +103,21 @@ pipeline {
stage('Ambari Server PyTests') {
steps {
- sh 'mvn -am test -pl ambari-server -DskipSurefireTests
-Dmaven.test.failure.ignore -Dmaven.artifact.threads=10 -Drat.skip
-Dcheckstyle.skip'
+ sh 'mvn clean -am test -pl ambari-server
-DskipSurefireTests -Dmaven.test.failure.ignore -Dmaven.artifact.threads=10
-Drat.skip -Dcheckstyle.skip -DskipAdminWebTests=true'
}
}
}
}
+ stage('Ambari WebUI Tests') {
+ steps {
+ withEnv(['CHROME_BIN=/usr/bin/chromium-browser']) {
+ sh 'mvn -T 2C -am test -pl ambari-web,ambari-admin
-Dmaven.artifact.threads=10 -Drat.skip'
+ }
+ }
+ }
stage('Ambari Server JTests') {
steps {
- sh 'mvn -am test -pl ambari-server -DskipPythonTests
-Dmaven.test.failure.ignore -Dmaven.artifact.threads=10 -Drat.skip'
+ sh 'mvn -am test -pl ambari-server -DskipPythonTests
-Dmaven.test.failure.ignore -Dmaven.artifact.threads=10 -Drat.skip
-DskipAdminWebTests=true'
}
}
}
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index c9b36f4dde..f20892dee6 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -169,16 +169,16 @@
<groupId>org.vafer</groupId>
<artifactId>jdeb</artifactId>
<executions>
- <execution>
- <phase>none</phase>
- <goals>
- <goal>jdeb</goal>
- </goals>
- </execution>
+ <execution>
+ <phase>none</phase>
+ <goals>
+ <goal>jdeb</goal>
+ </goals>
+ </execution>
</executions>
<configuration>
- <skip>true</skip>
- <submodules>false</submodules>
+ <skip>true</skip>
+ <submodules>false</submodules>
</configuration>
</plugin>
<plugin>
@@ -227,7 +227,7 @@
</resource>
</resources>
</build>
- <profiles>
+ <profiles>
<profile>
<id>windows</id>
<activation>
@@ -260,35 +260,48 @@
<args.shell></args.shell>
</properties>
</profile>
- <profile>
- <id>pluggable-stack-definition</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.2.1</version>
- <executions>
- <execution>
- <id>copy-pluggable-stack-resources</id>
- <phase>initialize</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <!-- Copy stack specific UI resources -->
- <executable>${executable.shell}</executable>
- <workingDirectory>${basedir}</workingDirectory>
- <commandlineArgs>${args.shell}
${basedir}${dirsep}copy-pluggable-stack-resources.${fileextension.shell}
${stack.distribution}</commandlineArgs>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profile>
+ <id>pluggable-stack-definition</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <id>copy-pluggable-stack-resources</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <!-- Copy stack specific UI resources -->
+ <executable>${executable.shell}</executable>
+ <workingDirectory>${basedir}</workingDirectory>
+ <commandlineArgs>${args.shell}
${basedir}${dirsep}copy-pluggable-stack-resources.${fileextension.shell}
${stack.distribution}</commandlineArgs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>skip-admin-web-tests</id>
+ <activation>
+ <property>
+ <name>skipAdminWebTests</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <properties>
+ <skipTests>true</skipTests>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+ </profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 47f657ac11..d6562606ac 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1136,6 +1136,11 @@
<artifactId>ambari-views</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ambari-admin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>ambari-server-spi</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
