Permalink
Browse files

faster CI builds: parallel mvn, skip product

  • Loading branch information...
1 parent fb87f9a commit 259c1d8b10f7492166b23ea5a136e3a4eb1a838d @vladdu vladdu committed Feb 6, 2017
Showing with 41 additions and 26 deletions.
  1. +36 −20 Jenkinsfile
  2. +3 −4 org.erlide.parent/pom.xml
  3. +2 −2 org.erlide.target/org.erlide.target.target
View
@@ -25,11 +25,13 @@ pipeline {
}
}
- //stage('Tests') {
- // steps{
- // runTests()
- // }
- //}
+ // stage('Tests') {
+ // steps{
+ // script {
+ // runTests()
+ // }
+ // }
+ // }
stage('Analyze') {
steps{
@@ -74,7 +76,7 @@ def checkout() {
checkout([
$class: 'GitSCM',
branches: scm.branches,
- extensions: scm.extensions + [[$class: 'CleanCheckout'], [$class: 'CloneOption', depth: 0, noTags: true, reference: '', shallow: false]],
+ extensions: scm.extensions + [[$class: 'CleanCheckout'], [$class: 'CloneOption', depth: 10, noTags: true, reference: '', shallow: true]],
userRemoteConfigs: scm.userRemoteConfigs
])
git_branch = env.BRANCH_NAME
@@ -92,20 +94,34 @@ def checkout() {
}
def compile() {
- wrap([$class: 'Xvfb', displayNameOffset: 100, installationName: 'xvfb', screen: '1024x768x24']) {
- dir('org.erlide.parent') {
- sh "chmod u+x mvnw"
- def product
- if(git_branch=="master")
- product=",build-ide"
- else
- product=""
- profiles="help${product}"
- sh "PATH=$PATH:~jenkins/erlide_tools && ./mvnw -B -U clean verify -P ${profiles} -Dmaven.test.failure.ignore=true"
-
- if(git_branch=="master") {
- // TODO rename product artifacts
- }
+ dir('org.erlide.parent') {
+ sh "chmod u+x mvnw"
+ def product
+ if(git_branch=="master")
+ product=",build-product"
+ else
+ product=""
+ profiles="help${product}"
+ wrap([$class: 'Xvfb', displayNameOffset: 100, installationName: 'xvfb', screen: '1024x768x24']) {
+ sh "PATH=$PATH:~jenkins/erlide_tools && ./mvnw -T 1C -B -U clean verify -P ${profiles} -D_maven.test.skip=true -Dmaven.test.failure.ignore=true"
+ }
+ if(git_branch=="master") {
+ // TODO rename product artifacts
+ }
+ }
+}
+
+def runTests() {
+ dir('org.erlide.parent') {
+ sh "git reset --hard"
+ sh "chmod u+x mvnw"
+ def profiles
+ if(git_branch=="master")
+ profiles="-P build-product"
+ else
+ profiles=""
+ wrap([$class: 'Xvfb', displayNameOffset: 100, installationName: 'xvfb', screen: '1024x768x24']) {
+ // sh "PATH=$PATH:~jenkins/erlide_tools && ./mvnw -T 1C -B -U verify ${profiles} -Dmaven.test.failure.ignore=true"
}
}
}
@@ -19,12 +19,12 @@
<repository>
<id>mars</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/releases/mars</url>
+ <url>http://download.eclipse.org/releases/mars/201602261000</url>
</repository>
<repository>
<id>mars updates</id>
<layout>p2</layout>
- <url>http://download.eclipse.org/eclipse/updates/4.5</url>
+ <url>http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500</url>
</repository>
<repository>
<id>graphviz</id>
@@ -89,7 +89,6 @@
<module>../org.erlide.tracing.core</module>
<module>../org.erlide.site</module>
- <module>../org.erlide.product.site</module>
<module>../org.erlide.testing.libs</module>
@@ -175,7 +174,7 @@
</build>
</profile>
<profile>
- <id>build-ide</id>
+ <id>build-product</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
@@ -4,14 +4,14 @@
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.e4.rcp.feature.group" version="0.0.0"/>
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/mars"/>
+<repository location="http://download.eclipse.org/releases/mars/201602261000"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.abstratt.eclipsegraphviz.feature.feature.group" version="1.8.0.201208300609"/>
<repository location="http://download.erlide.org/update/graphviz"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="com.google.gson" version="2.7.0.v20161205-1708"/>

0 comments on commit 259c1d8

Please sign in to comment.