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

[Jenkins] Update jenkins-library, explicitly build package-target.

parent dc15a3f4
No related branches found
No related tags found
No related merge requests found
#!/usr/bin/env groovy #!/usr/bin/env groovy
@Library('jenkins-pipeline@1.0.15') _ @Library('jenkins-pipeline@1.0.17') _
def stage_required = [build: false, data: false, full: false, docker: false] def stage_required = [build: false, data: false, full: false, docker: false]
...@@ -94,7 +94,10 @@ pipeline { ...@@ -94,7 +94,10 @@ pipeline {
'-DOGS_USE_PYTHON=ON ' + '-DOGS_USE_PYTHON=ON ' +
'-DOGS_BUILD_UTILS=ON ' '-DOGS_BUILD_UTILS=ON '
} }
build { log="build.log" } build {
target="package"
log="build.log"
}
build { target="tests" } build { target="tests" }
build { target="ctest" } build { target="ctest" }
build { target="doc" } build { target="doc" }
...@@ -157,7 +160,10 @@ pipeline { ...@@ -157,7 +160,10 @@ pipeline {
'-DOGS_BUILD_UTILS=ON ' + '-DOGS_BUILD_UTILS=ON ' +
'-DOGS_BUILD_TESTS=OFF ' '-DOGS_BUILD_TESTS=OFF '
} }
build { log="build.log" } build {
target="package"
log="build.log"
}
} }
} }
post { post {
...@@ -179,7 +185,7 @@ pipeline { ...@@ -179,7 +185,7 @@ pipeline {
} }
agent { agent {
dockerfile { dockerfile {
filename 'Dockerfile.gcc.minimal' filename 'Dockerfile.gcc.full'
dir 'scripts/docker' dir 'scripts/docker'
label 'docker' label 'docker'
args '-v /home/jenkins/cache:/home/jenkins/cache -v /home/jenkins/cache/conan/.conan:/home/jenkins/.conan' args '-v /home/jenkins/cache:/home/jenkins/cache -v /home/jenkins/cache/conan/.conan:/home/jenkins/.conan'
...@@ -319,7 +325,10 @@ pipeline { ...@@ -319,7 +325,10 @@ pipeline {
} }
build { target="tests" } build { target="tests" }
build { target="ctest" } build { target="ctest" }
build { log="build.log" } build {
target="package"
log="build.log"
}
} }
} }
post { post {
...@@ -361,17 +370,11 @@ pipeline { ...@@ -361,17 +370,11 @@ pipeline {
'-DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" ' '-DCMAKE_OSX_DEPLOYMENT_TARGET="10.13" '
} }
build { build {
target="package"
log = "build.log" log = "build.log"
cmd_args = '-j $(( `sysctl -n hw.ncpu` - 2 ))'
}
build {
target = 'tests'
cmd_args = '-j $(( `sysctl -n hw.ncpu` - 2 ))'
}
build {
target = 'ctest'
cmd_args = '-j $(( `sysctl -n hw.ncpu` - 2 ))'
} }
build { target = 'tests' }
build { target = 'ctest' }
} }
} }
post { post {
...@@ -444,7 +447,7 @@ pipeline { ...@@ -444,7 +447,7 @@ pipeline {
} }
try { try {
build { target = 'check-header' } build { target = 'check-header' }
build { target = 'all' } build { }
} }
catch (Exception e) { } catch (Exception e) { }
} }
...@@ -488,7 +491,7 @@ pipeline { ...@@ -488,7 +491,7 @@ pipeline {
build { build {
env = 'envinf1/cli.sh' env = 'envinf1/cli.sh'
target = 'install' target = 'install'
cmd_args = '-l 30'
} }
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment