Skip to content
Snippets Groups Projects
Commit 4d575e42 authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

debugging...

parent 0b9e246d
No related branches found
No related tags found
No related merge requests found
......@@ -89,7 +89,7 @@ def transformIntoStep(ArrayList<String> dependencyList, String buildName, String
stage(buildName) {
node('Docker') {
// we need root access inside the container and access to the dummy pcie devices of the host
def dockerArgs = "-u 0 --device=/dev/mtcadummys0 --device=/dev/mtcadummys1 --device=/dev/mtcadummys2 --device=/dev/mtcadummys3 --device=/dev/llrfdummys4 --device=/dev/noioctldummys5 --device=/dev/pcieunidummys6 -v /var/run/lock/mtcadummy:/var/run/lock/mtcadummy"
def dockerArgs = "-u 0 --privileged --device=/dev/mtcadummys0 --device=/dev/mtcadummys1 --device=/dev/mtcadummys2 --device=/dev/mtcadummys3 --device=/dev/llrfdummys4 --device=/dev/noioctldummys5 --device=/dev/pcieunidummys6 -v /var/run/lock/mtcadummy:/var/run/lock/mtcadummy"
docker.image("builder:${label}").inside(dockerArgs) {
script {
helper.doBuildTestDeploy(dependencyList, label, buildType, gitUrl)
......
......@@ -152,7 +152,7 @@ def doBuild(String label, String buildType) {
sudo -u msk_jenkins mkdir -p /scratch/install
cd /scratch/build-${JOB_NAME}
sudo -u msk_jenkins cmake /scratch/source -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=${buildType} -DSUPPRESS_AUTO_DOC_BUILD=true \${CMAKE_EXTRA_ARGS}
sudo -u msk_jenkins make \${MAKEOPTS}
sudo -u msk_jenkins make ${env.MAKEOPTS}
"""
}
script {
......@@ -174,7 +174,7 @@ def doTest(String label, String buildType) {
sh """
cd /scratch/build-${JOB_NAME}
if [ -z "\${CTESTOPTS}" ]; then
CTESTOPTS="\${MAKEOPTS}"
CTESTOPTS="${env.MAKEOPTS}"
fi
sudo -u msk_jenkins ctest --no-compress-output \${CTESTOPTS} -T Test -V || true
sudo -u msk_jenkins sed -i Testing/*/Test.xml -e 's_\\(^[[:space:]]*<Name>\\)\\(.*\\)\\(</Name>\\)\$_\\1${label}.${buildType}.\\2\\3_'
......
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