aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElena Vilchik2018-06-20 17:37:16 +0200
committerGitHub2018-06-20 17:37:16 +0200
commite6310621c493616da9c251027960c0ba34ea8cc5 (patch)
tree24151146b6732f22f45b87905d0cc36450e77f36
parent5fa2bf885df67839732ce45bca9b2d7dbdd1eb67 (diff)
downloadsonar-css-e6310621c493616da9c251027960c0ba34ea8cc5.tar.bz2
Include windows ITs (#54)
-rw-r--r--Jenkinsfile20
1 files changed, 5 insertions, 15 deletions
diff --git a/Jenkinsfile b/Jenkinsfile
index 632e12a..83c1604 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -40,16 +40,14 @@ pipeline {
runITs "LATEST_RELEASE"
}
}
-/* excluding Windows build temporarily as Node is not available there
stage('ITs-windows') {
agent {
label 'windows'
}
steps {
- runITsWindows "LATEST_RELEASE"
+ runITs "LATEST_RELEASE"
}
}
-*/
stage('ITs-dev') {
agent {
label 'linux'
@@ -94,18 +92,10 @@ def runITs(String sqRuntimeVersion) {
withMaven(maven: MAVEN_TOOL) {
mavenSetBuildVersion()
dir('its') {
- sh "mvn ${itBuildArguments sqRuntimeVersion}"
- }
- }
- }
-}
-
-def runITsWindows(String sqRuntimeVersion) {
- withQAEnv {
- withMaven(maven: MAVEN_TOOL) {
- mavenSetBuildVersion()
- dir('its') {
- sh "mvn.cmd ${itBuildArguments sqRuntimeVersion}"
+ nodejs('NodeJS 10.4.1') {
+ def mvn = isUnix() ? 'mvn' : 'mvn.cmd'
+ sh "${mvn} ${itBuildArguments sqRuntimeVersion}"
+ }
}
}
}