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 5d5882d SLING-7597 - Investigate setting up Windows testing
5d5882d is described below
commit 5d5882d226dc4795148c8b7cf5d76a606db89d69
Author: Robert Munteanu <[email protected]>
AuthorDate: Tue Feb 26 23:29:12 2019 +0100
SLING-7597 - Investigate setting up Windows testing
Use a single SlingJenkinsHelper to prevent duplicate init/configure/notify
stages.
---
Jenkinsfile | 110 +++++++++++++++++++++++++++++-------------------------------
1 file changed, 53 insertions(+), 57 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 793d35e..e8c2def 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,87 +9,83 @@ parallel 'linux' : {
def helper = new SlingJenkinsHelper()
helper.runWithErrorHandling({ jobConfig ->
-
- stage('[linux] Build shared code') {
- withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
- timeout(10) {
- sh "mvn -f shared/modules clean install"
+ parallel 'linux': {
+ stage('[linux] Build shared code') {
+ withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
+ timeout(10) {
+ sh "mvn -f shared/modules clean install"
+ }
}
}
- }
- stage('[linux] Build CLI bundles') {
- withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
- timeout(10) {
- sh "mvn -f cli clean install"
+ stage('[linux] Build CLI bundles') {
+ withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
+ timeout(10) {
+ sh "mvn -f cli clean install"
+ }
}
}
- }
- stage ('[linux] Build shared code P2 repository') {
- withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
- timeout(10) {
- sh 'mvn -f shared/p2 clean package'
+ stage ('[linux] Build shared code P2 repository') {
+ withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
+ timeout(10) {
+ sh 'mvn -f shared/p2 clean package'
+ }
}
}
- }
- stage ('[linux] Build Eclipse plug-ins') {
- withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
- timeout(20) {
- wrap([$class: 'Xvfb']) {
- sh 'mvn -f eclipse clean verify -Ddebug'
+ stage ('[linux] Build Eclipse plug-ins') {
+ withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
+ timeout(20) {
+ wrap([$class: 'Xvfb']) {
+ sh 'mvn -f eclipse clean verify -Ddebug'
+ }
+ // workaround for
https://issues.jenkins-ci.org/browse/JENKINS-55889
+ junit 'eclipse/**/surefire-reports/*.xml'
+ archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
}
- // workaround for
https://issues.jenkins-ci.org/browse/JENKINS-55889
- junit 'eclipse/**/surefire-reports/*.xml'
- archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
}
}
- }
- });
- }
-},
-'windows' : {
- node('Windows') {
- def helper = new SlingJenkinsHelper()
- helper.runWithErrorHandling({ jobConfig ->
-
- stage('[win] Build shared code') {
- withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
- timeout(10) {
- bat "mvn -f shared/modules clean install"
+ });
+ }, 'windows': {
+ node('Windows'): {
+ stage('[win] Build shared code') {
+ withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
+ timeout(10) {
+ bat "mvn -f shared/modules clean install"
+ }
}
}
- }
- stage('[win] Build CLI bundles') {
- withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
- timeout(10) {
- bat "mvn -f cli clean install"
+ stage('[win] Build CLI bundles') {
+ withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
+ timeout(10) {
+ bat "mvn -f cli clean install"
+ }
}
}
- }
- stage ('[win] Build shared code P2 repository') {
- withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
- timeout(10) {
- bat 'mvn -f shared/p2 clean package'
+ stage ('[win] Build shared code P2 repository') {
+ withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
+ timeout(10) {
+ bat 'mvn -f shared/p2 clean package'
+ }
}
}
- }
- stage ('[win] Build Eclipse plug-ins') {
- withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
- timeout(20) {
- wrap([$class: 'Xvfb']) {
- bat 'mvn -f eclipse clean verify -Ddebug'
+ stage ('[win] Build Eclipse plug-ins') {
+ withMaven(maven: mvnVersion, jdk: javaVersion, options:
[artifactsPublisher(disabled: true)]) {
+ timeout(20) {
+ wrap([$class: 'Xvfb']) {
+ bat 'mvn -f eclipse clean verify -Ddebug'
+ }
+ // workaround for
https://issues.jenkins-ci.org/browse/JENKINS-55889
+ junit 'eclipse/**/surefire-reports/*.xml'
+ archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
}
- // workaround for
https://issues.jenkins-ci.org/browse/JENKINS-55889
- junit 'eclipse/**/surefire-reports/*.xml'
- archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
}
}
}
- });
+ }
}
}
