mirror of
https://github.com/triqs/dft_tools
synced 2024-11-18 12:03:50 +01:00
Revert "[jenkins] try setting ansiColor as a build property"
This reverts commit 2a9b29741e
.
This commit is contained in:
parent
2a9b29741e
commit
ad0853b6bc
11
Jenkinsfile
vendored
11
Jenkinsfile
vendored
@ -17,8 +17,7 @@ properties([
|
|||||||
threshold: 'SUCCESS',
|
threshold: 'SUCCESS',
|
||||||
upstreamProjects: triqsProject
|
upstreamProjects: triqsProject
|
||||||
)
|
)
|
||||||
] : []),
|
] : [])
|
||||||
ansiColor('xterm')
|
|
||||||
])
|
])
|
||||||
|
|
||||||
/* map of all builds to run, populated below */
|
/* map of all builds to run, populated below */
|
||||||
@ -31,7 +30,7 @@ def dockerPlatforms = ["ubuntu-clang", "ubuntu-gcc", "centos-gcc"]
|
|||||||
for (int i = 0; i < dockerPlatforms.size(); i++) {
|
for (int i = 0; i < dockerPlatforms.size(); i++) {
|
||||||
def platform = dockerPlatforms[i]
|
def platform = dockerPlatforms[i]
|
||||||
platforms[platform] = { -> node('docker') {
|
platforms[platform] = { -> node('docker') {
|
||||||
stage(platform) { timeout(time: 1, unit: 'HOURS') {
|
stage(platform) { timeout(time: 1, unit: 'HOURS') { ansiColor('xterm') {
|
||||||
checkout scm
|
checkout scm
|
||||||
/* construct a Dockerfile for this base */
|
/* construct a Dockerfile for this base */
|
||||||
sh """
|
sh """
|
||||||
@ -48,7 +47,7 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
|
|||||||
if (!keepInstall) {
|
if (!keepInstall) {
|
||||||
sh "docker rmi --no-prune ${img.imageName()}"
|
sh "docker rmi --no-prune ${img.imageName()}"
|
||||||
}
|
}
|
||||||
} }
|
} } }
|
||||||
} }
|
} }
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -61,7 +60,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
|
|||||||
def platformEnv = osxPlatforms[i]
|
def platformEnv = osxPlatforms[i]
|
||||||
def platform = platformEnv[0]
|
def platform = platformEnv[0]
|
||||||
platforms["osx-$platform"] = { -> node('osx && triqs') {
|
platforms["osx-$platform"] = { -> node('osx && triqs') {
|
||||||
stage("osx-$platform") { timeout(time: 1, unit: 'HOURS') {
|
stage("osx-$platform") { timeout(time: 1, unit: 'HOURS') { ansiColor('xterm') {
|
||||||
def srcDir = pwd()
|
def srcDir = pwd()
|
||||||
def tmpDir = pwd(tmp:true)
|
def tmpDir = pwd(tmp:true)
|
||||||
def buildDir = "$tmpDir/build"
|
def buildDir = "$tmpDir/build"
|
||||||
@ -98,7 +97,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
|
|||||||
} }
|
} }
|
||||||
sh "make install"
|
sh "make install"
|
||||||
} }
|
} }
|
||||||
} }
|
} } }
|
||||||
} }
|
} }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user