Skip to content

Speed up ci/e2e builds #3130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wu-sheng merged 8 commits into from
Jul 21, 2019
Merged

Speed up ci/e2e builds #3130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c47f9ba
Make use of multi-thread builds of maven
kezhenxu94 Jul 20, 2019
7871ef3
Bump up maven version to get rid of parallel build bug
kezhenxu94 Jul 20, 2019
f6f9c3b
Apply the same to E2E tests
kezhenxu94 Jul 20, 2019
e9968ee
Apply the same to JavaDoc task
kezhenxu94 Jul 20, 2019
a6a66b0
Revert E2E settings
kezhenxu94 Jul 20, 2019
728b363
Add maven tuning opts
kezhenxu94 Jul 20, 2019
c8ac79e
Increase maven fork process memory
kezhenxu94 Jul 21, 2019
fee57d5
Merge branch 'master' into enhancement/speed-up-build
kezhenxu94 Jul 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
10 changes: 8 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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'
}
}
}
Expand Down
10 changes: 9 additions & 1 deletion Jenkinsfile-E2E
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}
}
Expand Down