diff --git a/Jenkinsfile b/Jenkinsfile index 4bc02313144ca19d347f8e524efa56251d00042b..90ec74377bf9ef36a9de3bd68c58aef1c700d342 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -124,14 +124,42 @@ pipeline { } } } + stage('Envinf1 (serial)') { + agent { label "envinf1"} + steps { + script { + configure { + cmakeOptions = + '-DCMAKE_BUILD_TYPE=Release ' + + '-DOGS_BUILD_UTILS=ON ' + + '-DOGS_BUILD_METIS=ON ' + + '-DBUILD_SHARED_LIBS=ON ' + env = 'envinf1/cli.sh' + } + build { env = 'envinf1/cli.sh' } + build { + env = 'envinf1/cli.sh' + target = 'tests' + } + build { + env = 'envinf1/cli.sh' + target = 'ctest' + } + } + } + post { + always { + publishReports { } + dir('build') { deleteDir() } + } + } + } // ************************** Windows ********************************** stage('Win') { - agent { - label "win && conan" - } + agent {label 'win && conan' } environment { MSVC_NUMBER = '15' - MSVC_VERSION = "2017" + MSVC_VERSION = '2017' } steps { script { diff --git a/scripts/env/envinf1/cli.sh b/scripts/env/envinf1/cli.sh index 82b8c42076ad6020117c90932c4ac92f56bff4c9..3961859893b8654580dd8ed0a8aa457bf763703e 100644 --- a/scripts/env/envinf1/cli.sh +++ b/scripts/env/envinf1/cli.sh @@ -3,6 +3,7 @@ export MODULEPATH=$MODULEPATH:/global/apps/modulefiles module load cmake/3.1.3-1 module load gcc/6.2.0-1 +module load ninja/1.8.2 module load git/2.3.2-1 # Libraries