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 7edff79 SLING-7597 - Investigate setting up Windows testing
7edff79 is described below
commit 7edff79404347d1901e6a4252fc81ef613bcd79a
Author: Robert Munteanu <[email protected]>
AuthorDate: Tue Feb 26 23:31:24 2019 +0100
SLING-7597 - Investigate setting up Windows testing
Fix syntax.
---
Jenkinsfile | 113 +++++++++++++++++++++++++++++-------------------------------
1 file changed, 55 insertions(+), 58 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e8c2def..9ae2c6b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,89 +3,86 @@ import org.apache.sling.jenkins.SlingJenkinsHelper;
def mvnVersion = 'Maven 3.3.9'
def javaVersion = 'JDK 1.8 (latest)'
-parallel 'linux' : {
-
- node('ubuntu') {
+node('ubuntu') {
- def helper = new SlingJenkinsHelper()
- helper.runWithErrorHandling({ jobConfig ->
- 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"
- }
+ def helper = new SlingJenkinsHelper()
+ helper.runWithErrorHandling({ jobConfig ->
+ 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'
- }
- // workaround for
https://issues.jenkins-ci.org/browse/JENKINS-55889
- junit 'eclipse/**/surefire-reports/*.xml'
- archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
+ 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'
}
}
- });
- }, '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"
- }
+ }
+ });
+ }, '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'
- }
- // workaround for
https://issues.jenkins-ci.org/browse/JENKINS-55889
- junit 'eclipse/**/surefire-reports/*.xml'
- archiveArtifacts artifacts: 'eclipse/**/logs/*.log'
+ 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'
}
}
}
}
}
-}
+}
\ No newline at end of file
