This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to branch feature/SLING-7597
in repository https://gitbox.apache.org/repos/asf/sling-ide-tooling.git
The following commit(s) were added to refs/heads/feature/SLING-7597 by this
push:
new c7330dd SLING-7597 - Investigate setting up Windows testing
c7330dd is described below
commit c7330dd12366912d42efddbc929435c8f9732119
Author: Robert Munteanu <[email protected]>
AuthorDate: Wed Feb 27 15:13:27 2019 +0100
SLING-7597 - Investigate setting up Windows testing
Try and defer stage creation even more, so that execution is parallel.
---
Jenkinsfile | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index fc195c5..a853597 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,28 +17,25 @@ def generateStages(String os, def mvnVersion, def
javaVersion) {
def prefix = isWindows ? "win" : "linux"
def stages = [
- stage("[$prefix] Build shared code") {
+ "[$prefix] Build shared code": {
withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
timeout(10) {
runCmd "mvn -f shared/modules clean install"
}
}
- },
- stage("[$prefix] Build CLI bundles") {
+ }, "[$prefix] Build CLI bundles": {
withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
timeout(10) {
runCmd "mvn -f cli clean install"
}
}
- },
- stage ("[$prefix] Build shared code P2 repository") {
+ }, "[$prefix] Build shared code P2 repository": {
withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
timeout(10) {
runCmd 'mvn -f shared/p2 clean package'
}
}
- },
- stage ("[$prefix] Build Eclipse plug-ins") {
+ }, "[$prefix] Build Eclipse plug-ins": {
withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
timeout(20) {
if ( isUnix() ) {
@@ -64,16 +61,22 @@ def generateStages(String os, def mvnVersion, def
javaVersion) {
// SCM checkout unavailable
if ( isWindows ) {
return {
- stages.each { s->
+ stages.each { name, body ->
node("Windows") {
- s.call()
+ stage(name) {
+ body.call()
+ }
}
}
}
}
return {
- stages.each { it.call() }
+ stages.each { name, body ->
+ stage(name) {
+ body.call()
+ }
+ }
}
}