From 3e893ee19d872318b800f92f7fcca97cf624802b Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 27 Mar 2024 10:20:42 +0100 Subject: [PATCH] Disable the ninja builds for now as they fail with the current Docker setup --- Jenkinsfile | 176 ++++++++++++++++++++++++++-------------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e2d8a59ff7..5a435c5893 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -111,50 +111,50 @@ linux_gcc_make: { } // node('linux') } }, -linux_gcc_ninja: { - if (env.USE_BUILD_OS_LINUX == 'true') { - node('linux-gcc') { - stage('linux-gcc-ninja/scm') { - deleteDir(); - gitHelper.checkoutGit(url, branch); - } - - stage('linux-gcc-ninja/build') { - def cmakeCompileOptions = moduleCMakeFlags(); - cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release'; - // Not sure why the linking of OpenSpaceTest takes so long - compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, '', 'build-ninja'); - } - - if (env.RUN_UNIT_TESTS == 'true') { - stage('linux-gcc-ninja/test-codegen') { - timeout(time: 2, unit: 'MINUTES') { - testHelper.runUnitTests('bin/codegentest'); - } - } - - stage('linux-gcc-ninja/test-sgct') { - timeout(time: 2, unit: 'MINUTES') { - testHelper.runUnitTests('bin/SGCTTest'); - } - } - - stage('linux-gcc-ninja/test-ghoul') { - timeout(time: 2, unit: 'MINUTES') { - testHelper.runUnitTests('bin/GhoulTest'); - } - } - - stage('linux-gcc-ninja/test-openspace') { - timeout(time: 2, unit: 'MINUTES') { - testHelper.runUnitTests('bin/OpenSpaceTest'); - } - } - } - cleanWs() - } // node('linux') - } -}, +// linux_gcc_ninja: { +// if (env.USE_BUILD_OS_LINUX == 'true') { +// node('linux-gcc') { +// stage('linux-gcc-ninja/scm') { +// deleteDir(); +// gitHelper.checkoutGit(url, branch); +// } +// +// stage('linux-gcc-ninja/build') { +// def cmakeCompileOptions = moduleCMakeFlags(); +// cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release'; +// // Not sure why the linking of OpenSpaceTest takes so long +// compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, '', 'build-ninja'); +// } +// +// if (env.RUN_UNIT_TESTS == 'true') { +// stage('linux-gcc-ninja/test-codegen') { +// timeout(time: 2, unit: 'MINUTES') { +// testHelper.runUnitTests('bin/codegentest'); +// } +// } +// +// stage('linux-gcc-ninja/test-sgct') { +// timeout(time: 2, unit: 'MINUTES') { +// testHelper.runUnitTests('bin/SGCTTest'); +// } +// } +// +// stage('linux-gcc-ninja/test-ghoul') { +// timeout(time: 2, unit: 'MINUTES') { +// testHelper.runUnitTests('bin/GhoulTest'); +// } +// } +// +// stage('linux-gcc-ninja/test-openspace') { +// timeout(time: 2, unit: 'MINUTES') { +// testHelper.runUnitTests('bin/OpenSpaceTest'); +// } +// } +// } +// cleanWs() +// } // node('linux') +// } +// }, linux_clang_make: { if (env.USE_BUILD_OS_LINUX == 'true') { node('linux-clang') { @@ -200,50 +200,50 @@ linux_clang_make: { } // node('linux') } }, -linux_clang_ninja: { - if (env.USE_BUILD_OS_LINUX == 'true') { - node('linux-clang') { - stage('linux-clang-ninja/scm') { - deleteDir() - gitHelper.checkoutGit(url, branch); - } - - stage('linux-clang-ninja/build') { - def cmakeCompileOptions = moduleCMakeFlags() - cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release' - // Not sure why the linking of OpenSpaceTest takes so long - compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, '', 'build-ninja'); - } - - if (env.RUN_UNIT_TESTS == 'true') { - stage('linux-clang-ninja/test-codegen') { - timeout(time: 2, unit: 'MINUTES') { - testHelper.runUnitTests('bin/codegentest'); - } - } - - stage('linux-clang-ninja/test-sgct') { - timeout(time: 2, unit: 'MINUTES') { - testHelper.runUnitTests('bin/SGCTTest'); - } - } - - stage('linux-clang-ninja/test-ghoul') { - timeout(time: 2, unit: 'MINUTES') { - testHelper.runUnitTests('bin/GhoulTest'); - } - } - - stage('linux-clang-ninja/test-openspace') { - timeout(time: 2, unit: 'MINUTES') { - testHelper.runUnitTests('bin/OpenSpaceTest'); - } - } - } - cleanWs() - } // node('linux') - } -}, +// linux_clang_ninja: { +// if (env.USE_BUILD_OS_LINUX == 'true') { +// node('linux-clang') { +// stage('linux-clang-ninja/scm') { +// deleteDir() +// gitHelper.checkoutGit(url, branch); +// } +// +// stage('linux-clang-ninja/build') { +// def cmakeCompileOptions = moduleCMakeFlags() +// cmakeCompileOptions += '-DMAKE_BUILD_TYPE=Release' +// // Not sure why the linking of OpenSpaceTest takes so long +// compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, '', 'build-ninja'); +// } +// +// if (env.RUN_UNIT_TESTS == 'true') { +// stage('linux-clang-ninja/test-codegen') { +// timeout(time: 2, unit: 'MINUTES') { +// testHelper.runUnitTests('bin/codegentest'); +// } +// } +// +// stage('linux-clang-ninja/test-sgct') { +// timeout(time: 2, unit: 'MINUTES') { +// testHelper.runUnitTests('bin/SGCTTest'); +// } +// } +// +// stage('linux-clang-ninja/test-ghoul') { +// timeout(time: 2, unit: 'MINUTES') { +// testHelper.runUnitTests('bin/GhoulTest'); +// } +// } +// +// stage('linux-clang-ninja/test-openspace') { +// timeout(time: 2, unit: 'MINUTES') { +// testHelper.runUnitTests('bin/OpenSpaceTest'); +// } +// } +// } +// cleanWs() +// } // node('linux') +// } +// }, windows_msvc: { if (env.USE_BUILD_OS_WINDOWS == 'true') { node('windows') {