Skip to content
Snippets Groups Projects
Commit ded93057 authored by Lars Bilke's avatar Lars Bilke
Browse files

Revert "[Jenkins] Explicitly allocate workspace before unstashing." 

This reverts commit 4282f5db.
parent 910edf2e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scripts/jenkins/gcc.groovy
+ 21
− 23
View file @ ded93057
......@@ -4,33 +4,31 @@ node('docker') {
'-DOGS_LIB_BOOST=System ' +
'-DOGS_LIB_VTK=System'
ws {
dir('ogs') { unstash 'source' }
dir('ogs') { unstash 'source' }
docker.image('ogs6/gcc-gui:latest').inside(defaultDockerArgs) {
stage 'Configure (Linux-Docker)'
configure.linux 'build', "${defaultCMakeOptions}"
docker.image('ogs6/gcc-gui:latest').inside(defaultDockerArgs) {
stage 'Configure (Linux-Docker)'
configure.linux 'build', "${defaultCMakeOptions}"
stage 'CLI (Linux-Docker)'
build.linux 'build'
stage 'CLI (Linux-Docker)'
build.linux 'build'
stage 'Test (Linux-Docker)'
build.linux 'build', 'tests ctest'
stage 'Test (Linux-Docker)'
build.linux 'build', 'tests ctest'
stage 'Data Explorer (Linux-Docker)'
configure.linux 'build', "${defaultCMakeOptions} " +
'-DOGS_BUILD_GUI=ON -DOGS_BUILD_UTILS=ON -DOGS_BUILD_TESTS=OFF',
'Unix Makefiles', null, true
build.linux 'build'
}
if (helper.isRelease()) {
stage 'Release (Linux-Docker)'
archive 'build/*.tar.gz'
}
stage 'Data Explorer (Linux-Docker)'
configure.linux 'build', "${defaultCMakeOptions} " +
'-DOGS_BUILD_GUI=ON -DOGS_BUILD_UTILS=ON -DOGS_BUILD_TESTS=OFF',
'Unix Makefiles', null, true
build.linux 'build'
}
stage 'Post (Linux-Docker)'
post.publishTestReports 'build/Testing/**/*.xml', 'build/Tests/testrunner.xml',
'ogs/scripts/jenkins/clang-log-parser.rules'
if (helper.isRelease()) {
stage 'Release (Linux-Docker)'
archive 'build/*.tar.gz'
}
stage 'Post (Linux-Docker)'
post.publishTestReports 'build/Testing/**/*.xml', 'build/Tests/testrunner.xml',
'ogs/scripts/jenkins/clang-log-parser.rules'
}
scripts/jenkins/mac.groovy
+ 19
− 21
View file @ ded93057
......@@ -6,31 +6,29 @@ node('mac && conan') {
'-DOGS_LIB_VTK=System ' +
'-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON'
ws {
dir('ogs') { unstash 'source' }
dir('ogs') { unstash 'source' }
stage 'Configure (Mac)'
configure.linux 'build', "${defaultCMakeOptions}", 'Ninja', ''
stage 'Configure (Mac)'
configure.linux 'build', "${defaultCMakeOptions}", 'Ninja', ''
stage 'CLI (Mac)'
build.linux 'build', null, 'ninja'
stage 'CLI (Mac)'
build.linux 'build', null, 'ninja'
stage 'Test (Mac)'
build.linux 'build', 'tests ctest', 'ninja'
stage 'Test (Mac)'
build.linux 'build', 'tests ctest', 'ninja'
stage 'Data Explorer (Mac)'
configure.linux 'build', "${defaultCMakeOptions} " +
'-DOGS_BUILD_GUI=ON -DOGS_BUILD_UTILS=ON -DOGS_BUILD_TESTS=OFF',
'Ninja', '', true
build.linux 'build', null, 'ninja'
stage 'Data Explorer (Mac)'
configure.linux 'build', "${defaultCMakeOptions} " +
'-DOGS_BUILD_GUI=ON -DOGS_BUILD_UTILS=ON -DOGS_BUILD_TESTS=OFF',
'Ninja', '', true
build.linux 'build', null, 'ninja'
if (helper.isRelease()) {
stage 'Release (Mac)'
archive 'build/*.tar.gz,build/*.dmg'
}
stage 'Post (Mac)'
post.publishTestReports 'build/Testing/**/*.xml', 'build/Tests/testrunner.xml',
'ogs/scripts/jenkins/msvc-log-parser.rules'
if (helper.isRelease()) {
stage 'Release (Mac)'
archive 'build/*.tar.gz,build/*.dmg'
}
stage 'Post (Mac)'
post.publishTestReports 'build/Testing/**/*.xml', 'build/Tests/testrunner.xml',
'ogs/scripts/jenkins/msvc-log-parser.rules'
}
scripts/jenkins/msvc.groovy
+ 29
− 31
View file @ ded93057
......@@ -11,36 +11,34 @@ node('win && conan') {
'-DOGS_BUILD_TESTS=OFF ' +
'-DOGS_BUILD_SWMM=ON'
ws {
dir('ogs') { unstash 'source' }
withEnv(helper.getEnv()) {
stage 'Configure (Win)'
configure.win 'build', "${defaultCMakeOptions}", 'Ninja',
'-u -s build_type=Release -s compiler="Visual Studio" -s compiler.version=12 -s ' +
'arch=x86_64'
stage 'CLI (Win)'
build.win 'build'
stage 'Test (Win)'
build.win 'build', 'tests'
stage 'Data Explorer (Win)'
configure.win 'build', "${defaultCMakeOptions} ${guiCMakeOptions}", 'Ninja',
'-u -s build_type=Release -s compiler="Visual Studio" -s compiler.version=12' +
' -s arch=x86_64',
true
build.win 'build'
}
if (helper.isRelease()) {
stage 'Release (Win)'
archive 'build/*.zip'
}
stage 'Post (Win)'
post.publishTestReports 'build/Testing/**/*.xml', 'build/Tests/testrunner.xml',
'ogs/scripts/jenkins/msvc-log-parser.rules'
dir('ogs') { unstash 'source' }
withEnv(helper.getEnv()) {
stage 'Configure (Win)'
configure.win 'build', "${defaultCMakeOptions}", 'Ninja',
'-u -s build_type=Release -s compiler="Visual Studio" -s compiler.version=12 -s ' +
'arch=x86_64'
stage 'CLI (Win)'
build.win 'build'
stage 'Test (Win)'
build.win 'build', 'tests'
stage 'Data Explorer (Win)'
configure.win 'build', "${defaultCMakeOptions} ${guiCMakeOptions}",
'Ninja', '-u -s build_type=Release -s compiler="Visual Studio" -s compiler.version=12' +
' -s arch=x86_64',
true
build.win 'build'
}
if (helper.isRelease()) {
stage 'Release (Win)'
archive 'build/*.zip'
}
stage 'Post (Win)'
post.publishTestReports 'build/Testing/**/*.xml', 'build/Tests/testrunner.xml',
'ogs/scripts/jenkins/msvc-log-parser.rules'
}
scripts/jenkins/msvc32.groovy
+ 9
− 11
View file @ ded93057
......@@ -6,17 +6,15 @@ node('win && conan') {
'-DOGS_LIB_VTK=System ' +
'-DOGS_DOWNLOAD_ADDITIONAL_CONTENT=ON'
ws {
dir('ogs') { unstash 'source' }
dir('ogs') { unstash 'source' }
stage 'Data Explorer 32-bit (Win)'
withEnv(helper.getEnv('x32')) {
configure.win 'build-32', "${defaultCMakeOptions} " +
'-DOGS_BUILD_GUI=ON -DOGS_BUILD_UTILS=ON -DOGS_BUILD_TESTS=OFF',
'Ninja', '-u -s build_type=Release -s compiler="Visual ' +
'Studio" -s compiler.version=12 -s arch=x86'
build.win 'build-32'
}
archive 'build-32/*.zip'
stage 'Data Explorer 32-bit (Win)'
withEnv(helper.getEnv('x32')) {
configure.win 'build-32', "${defaultCMakeOptions} " +
'-DOGS_BUILD_GUI=ON -DOGS_BUILD_UTILS=ON -DOGS_BUILD_TESTS=OFF',
'Ninja', '-u -s build_type=Release -s compiler="Visual ' +
'Studio" -s compiler.version=12 -s arch=x86'
build.win 'build-32'
}
archive 'build-32/*.zip'
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment