diff options
| -rw-r--r-- | Jenkinsfile | 20 |
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}" + } } } } |