From d59d7570e542c63b18feaba31b280ef63225f2f3 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 1 Mar 2020 10:48:20 -0500 Subject: [PATCH] Improve indentation of Jenkinsfile --- Jenkinsfile | 95 ++++++++++++++++++++++++++--------------------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 104f07519a..a80e466537 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -116,36 +116,36 @@ pipeline failure { githubNotify context: 'CI', description: 'serial build failed', status: 'FAILURE' } - } + } steps { - timeout(time: 6, unit: 'HOURS') - { - sh "echo \"building on node ${env.NODE_NAME}\"" - sh '''#!/bin/bash - cd $WORKSPACE/ - ./contrib/utilities/check_doxygen.sh - ''' - sh '''#!/bin/bash - set -e - export NP=`grep -c ^processor /proc/cpuinfo` - export TEST_TIME_LIMIT=1200 - mkdir -p /home/dealii/build - cd /home/dealii/build - cmake -G "Ninja" \ - -D DEAL_II_CXX_FLAGS='-Werror' \ - -D CMAKE_BUILD_TYPE=Debug \ - -D DEAL_II_WITH_MPI=OFF \ - -D DEAL_II_WITH_CXX14=OFF \ - -D DEAL_II_UNITY_BUILD=ON \ - $WORKSPACE/ - time ninja -j $NP - time ninja test # quicktests - time ninja setup_tests - time ctest --output-on-failure -DDESCRIPTION="CI-$JOB_NAME" -j $NP --no-compress-output -T test - ''' - } + timeout(time: 6, unit: 'HOURS') + { + sh "echo \"building on node ${env.NODE_NAME}\"" + sh '''#!/bin/bash + cd $WORKSPACE/ + ./contrib/utilities/check_doxygen.sh + ''' + sh '''#!/bin/bash + set -e + export NP=`grep -c ^processor /proc/cpuinfo` + export TEST_TIME_LIMIT=1200 + mkdir -p /home/dealii/build + cd /home/dealii/build + cmake -G "Ninja" \ + -D DEAL_II_CXX_FLAGS='-Werror' \ + -D CMAKE_BUILD_TYPE=Debug \ + -D DEAL_II_WITH_MPI=OFF \ + -D DEAL_II_WITH_CXX14=OFF \ + -D DEAL_II_UNITY_BUILD=ON \ + $WORKSPACE/ + time ninja -j $NP + time ninja test # quicktests + time ninja setup_tests + time ctest --output-on-failure -DDESCRIPTION="CI-$JOB_NAME" -j $NP --no-compress-output -T test + ''' + } } } @@ -179,27 +179,26 @@ pipeline steps { - timeout(time: 6, unit: 'HOURS') - { - sh "echo \"building on node ${env.NODE_NAME}\"" - sh '''#!/bin/bash - set -e - set -x - export NP=`grep -c ^processor /proc/cpuinfo` - mkdir -p /home/dealii/build - cd /home/dealii/build - cmake -G "Ninja" \ - -D DEAL_II_CXX_FLAGS='-Werror' \ - -D CMAKE_BUILD_TYPE=Debug \ - -D DEAL_II_WITH_MPI=ON \ - -D DEAL_II_UNITY_BUILD=OFF \ - $WORKSPACE/ - time ninja -j $NP - time ninja test # quicktests - time ninja setup_tests - time ctest -R "all-headers|multigrid/transfer|matrix_free/matrix_" --output-on-failure -DDESCRIPTION="CI-$JOB_NAME" -j $NP --no-compress-output -T test - ''' - } + timeout(time: 6, unit: 'HOURS') + { + sh "echo \"building on node ${env.NODE_NAME}\"" + sh '''#!/bin/bash + set -e + export NP=`grep -c ^processor /proc/cpuinfo` + mkdir -p /home/dealii/build + cd /home/dealii/build + cmake -G "Ninja" \ + -D DEAL_II_CXX_FLAGS='-Werror' \ + -D CMAKE_BUILD_TYPE=Debug \ + -D DEAL_II_WITH_MPI=ON \ + -D DEAL_II_UNITY_BUILD=OFF \ + $WORKSPACE/ + time ninja -j $NP + time ninja test # quicktests + time ninja setup_tests + time ctest -R "all-headers|multigrid/transfer|matrix_free/matrix_" --output-on-failure -DDESCRIPTION="CI-$JOB_NAME" -j $NP --no-compress-output -T test + ''' + } } } -- 2.39.5