diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 00d32aab1d44085ccfba1be9c5af0f321bd6ca3d..ecd7f7d957253f9f2fa16658c840bdee5147fb42 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1 +1 @@ -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip \ No newline at end of file +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip diff --git a/Jenkinsfile b/Jenkinsfile index 9ae471d109fbdd31bb449f6389479657a92d9315..02987bfc3f43015bb527ff9a8164dd8b4ed7b63c 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,6 +28,10 @@ pipeline { timeout time: 60, unit: 'MINUTES' } + environment { + MAVEN_OPTS = '-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g' + } + stages { stage('Install & Test') { parallel { @@ -60,8 +64,10 @@ pipeline { stage('Test & Report') { steps { - sh './mvnw -P"agent,backend,ui,dist,CI-with-IT" org.jacoco:jacoco-maven-plugin:0.8.3:prepare-agent clean install org.jacoco:jacoco-maven-plugin:0.8.3:report coveralls:report' - sh './mvnw javadoc:javadoc -Dmaven.test.skip=true' + // separate lightweight checks that don't support parallel run + sh './mvnw checkstyle:check apache-rat:check' + sh './mvnw -Dcheckstyle.skip -Drat.skip -T2 -Dmaven.compile.fork -Dmaven.compiler.maxmem=3072 -P"agent,backend,ui,dist,CI-with-IT" org.jacoco:jacoco-maven-plugin:0.8.3:prepare-agent clean install org.jacoco:jacoco-maven-plugin:0.8.3:report coveralls:report' + sh './mvnw -DskipTests -Dcheckstyle.skip -Drat.skip -T 2C javadoc:javadoc' } } } diff --git a/Jenkinsfile-E2E b/Jenkinsfile-E2E index 2d1967412505a556f2dfcc1af0ebeb05f951e572..e3646ea7f75294535120902407c1cbd3142cd365 100644 --- a/Jenkinsfile-E2E +++ b/Jenkinsfile-E2E @@ -25,6 +25,10 @@ pipeline { jdk 'JDK 1.8 (latest)' } + environment { + MAVEN_OPTS = '-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC -XX:-UseGCOverheadLimit -Xmx3g' + } + stages { stage('Checkout Source Code') { steps { @@ -36,7 +40,11 @@ pipeline { stage('Prepare Distribution Package') { steps { - sh './mvnw -DskipTests clean package' + // although these checks are done in ci-it, since they are lightweight/cheap + // we're using them as a barrier here to filter out some invalid PRs (fast-fail) + // thus save unnecessary E2E builds(which is expensive) + sh './mvnw checkstyle:check apache-rat:check' + sh './mvnw -Dcheckstyle.skip -Drat.skip -T2 -Dmaven.compile.fork -Dmaven.compiler.maxmem=3072 -DskipTests clean package' sh 'tar -zxf dist/apache-skywalking-apm-bin.tar.gz -C dist' } }