diff --git a/Jenkinsfile b/Jenkinsfile index c8d23c763721f90260c693b4a2ada07c5fab6409..6ab5af0bd674466ecc033fd73c3f4fcc0d5fbb32 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -@Library('jenkins-pipeline@1.0.9') _ +@Library('jenkins-pipeline@1.0.12') _ def stage_required = [build: false, data: false, full: false] @@ -109,7 +109,7 @@ pipeline { '-DOGS_BUILD_UTILS=ON ' + '-DOGS_BUILD_TESTS=OFF ' } - build { } + build { log="build.log" } build { target="doc" } } } @@ -118,8 +118,9 @@ pipeline { publishReports { } recordIssues enabledForFailure: true, filters: [ excludeFile('.*qrc_icons\\.cpp.*'), excludeFile('.*QVTKWidget.*')], - tools: [[name: 'GCC', tool: [$class: 'GnuMakeGcc']]], - unstableTotalAll: 24 + tools: [[pattern: 'build/build.log', name: 'GCC', + tool: [$class: 'GnuMakeGcc']]], + unstableTotalAll: 19 } success { dir('build/docs') { stash(name: 'doxygen') } @@ -257,7 +258,7 @@ pipeline { '-DOGS_BUILD_TESTS=OFF ' + '-DOGS_BUILD_SWMM=ON ' } - build { } + build { log="build.log" } } } post { @@ -266,8 +267,9 @@ pipeline { recordIssues enabledForFailure: true, filters: [ excludeFile('.*\\.conan.*'), excludeFile('.*ThirdParty.*'), excludeFile('.*thread.hpp')], - tools: [[name: 'MSVC', tool: [$class: 'MsBuild']]], - unstableTotalAll: 6 + tools: [[pattern: 'build/build.log', name: 'MSVC', + tool: [$class: 'MsBuild']]], + unstableTotalAll: 4 } success { archiveArtifacts 'build/*.zip,build/conaninfo.txt' @@ -292,15 +294,15 @@ pipeline { '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" ' } build { - target = 'tests' + log = "build.log" cmd_args = '-j $(( `sysctl -n hw.ncpu` - 2 ))' } build { - target = 'ctest' + target = 'tests' cmd_args = '-j $(( `sysctl -n hw.ncpu` - 2 ))' } build { - target = 'package' + target = 'ctest' cmd_args = '-j $(( `sysctl -n hw.ncpu` - 2 ))' } } @@ -308,6 +310,11 @@ pipeline { post { always { publishReports { } + recordIssues enabledForFailure: true, filters: [ + excludeFile('.*qrc_icons\\.cpp.*'), excludeFile('.*QVTKWidget.*')], + tools: [[pattern: 'build/build.log', name: 'Clang (macOS)', + tool: [$class: 'Clang']]], + unstableTotalAll: 3 } success { archiveArtifacts 'build/*.tar.gz,build/*.dmg,build/conaninfo.txt' @@ -316,22 +323,6 @@ pipeline { } } // end parallel } // end stage Build - // *************************** Log Parser ********************************** - stage('Log Parser') { - agent any - steps { - script { - checkout scm - step([$class: 'LogParserPublisher', - failBuildOnError: true, - projectRulePath: "scripts/jenkins/all-log-parser.rules", - showGraphs: true, - unstableOnWarning: false, - useProjectRule: true - ]) - } - } - } stage('Master') { when { environment name: 'JOB_NAME', value: 'ufz/ogs/master' } parallel { diff --git a/scripts/jenkins/all-log-parser.rules b/scripts/jenkins/all-log-parser.rules deleted file mode 100644 index 30f37c6d15425abf9060e0666a247c7e52a90899..0000000000000000000000000000000000000000 --- a/scripts/jenkins/all-log-parser.rules +++ /dev/null @@ -1,25 +0,0 @@ -# Ignore warnings in Conan packages on Windows -ok /\\\.conan\\/ - -# Ignore linker warnings on envinf1 with petsc -ok /.*/usr/bin/ld: warning: libssl.*may conflict with libssl.*/ -ok /.*/usr/bin/ld: warning: libcrypto.*may conflict with libcrypto.*/ - -# CMake -warning /CMake Warning/ -error /CMake Error/ - -# CTest -warning \\[WARNING\]\ -error \[*][*][*]Failed\ - -# Clang -warning /: warning:/ - -# Clang sanitizer -error /: runtime error:/ -error /==ERROR:/ - -# MSVC -warning /: warning C/ -error /: error C/