Jenkinsfile: Workaround for Jenkins bug regarding changing dir in Docker container and path fix.
This commit is contained in:
parent
c902909923
commit
f5f128313f
7
Jenkinsfile
vendored
7
Jenkinsfile
vendored
@ -85,7 +85,6 @@ def doBuild(name, wsid, premakeFlags, configuration) {
|
||||
// This will run the unit tests for IW4x.
|
||||
// We need a Windows Server with MW2 on it.
|
||||
def doUnitTests(name, wsid) {
|
||||
ws("IW4x/testing/$wsid") {
|
||||
mw2dir = tool "Modern Warfare 2"
|
||||
|
||||
unstash "$name"
|
||||
@ -121,6 +120,7 @@ def doUnitTests(name, wsid) {
|
||||
// Run tests
|
||||
getIW4xExecutable()
|
||||
if (isUnix()) {
|
||||
sh "ls"
|
||||
sh "wine-wrapper iw4x.exe -tests"
|
||||
} else {
|
||||
bat "iw4x.exe -tests"
|
||||
@ -137,7 +137,6 @@ def doUnitTests(name, wsid) {
|
||||
}
|
||||
deleteDir()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Job properties
|
||||
@ -188,15 +187,17 @@ gitlabBuilds(builds: ["Checkout & Versioning", "Build", "Testing", "Archiving"])
|
||||
def configuration = configurations[i]
|
||||
executions["$configuration on Windows"] = {
|
||||
node("windows") {
|
||||
ws("IW4x/testing/$wsid") {
|
||||
doUnitTests("IW4x $configuration (unit tests)", configuration)
|
||||
}
|
||||
}
|
||||
}
|
||||
executions["$configuration on Linux"] = {
|
||||
node("docker && linux && amd64") {
|
||||
def image = null
|
||||
dir("src") {
|
||||
checkout scm
|
||||
image = docker.build("github.com/IW4x/iw4x-client-testing-wine32", "--rm --force-rm -f wine32.Dockerfile jenkins")
|
||||
image = docker.build("github.com/IW4x/iw4x-client-testing-wine32", "--rm --force-rm -f jenkins/wine32.Dockerfile jenkins")
|
||||
deleteDir()
|
||||
}
|
||||
image.inside {
|
||||
|
Loading…
Reference in New Issue
Block a user