Skip to content

Commit cc09d41

Browse files
authored
Merge pull request #1520 from stan-dev/ci/use-parallel-from-executors
Use Jenkins executor-local PARALLEL value
2 parents a680e15 + 3a76c1f commit cc09d41

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

Jenkinsfile

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,18 @@ def runPerformanceTests(String testsPath, String stancFlags = ""){
5858
cd performance-tests-cmdstan/cmdstan
5959
echo 'O=0' >> make/local
6060
echo 'CXXFLAGS+=-Wall' >> make/local
61-
make -j${env.PARALLEL} build
61+
make -j${PARALLEL} build
6262
"""
6363

6464
if (params.run_slow_perf_tests) {
6565
sh """
6666
cd performance-tests-cmdstan
67-
./runPerformanceTests.py -j${env.PARALLEL} --runs=0 --no-ignore-models ${testsPath}
67+
./runPerformanceTests.py -j${PARALLEL} --runs=0 --no-ignore-models ${testsPath}
6868
"""
6969
} else {
7070
sh """
7171
cd performance-tests-cmdstan
72-
./runPerformanceTests.py -j${env.PARALLEL} --runs=0 ${testsPath}
72+
./runPerformanceTests.py -j${PARALLEL} --runs=0 ${testsPath}
7373
"""
7474
}
7575
}
@@ -116,7 +116,6 @@ pipeline {
116116
environment {
117117
CXX = 'clang++-6.0'
118118
MACOS_SWITCH = 'stanc3-4.14'
119-
PARALLEL = 4
120119
GIT_AUTHOR_NAME = 'Stan Jenkins'
121120
GIT_AUTHOR_EMAIL = 'mc.stanislaw@gmail.com'
122121
GIT_COMMITTER_NAME = 'Stan Jenkins'
@@ -399,7 +398,7 @@ pipeline {
399398
agent {
400399
docker {
401400
image 'stanorg/ci:gpu'
402-
label 'linux'
401+
label 'linux && 8core'
403402
}
404403
}
405404
steps {
@@ -436,7 +435,7 @@ pipeline {
436435
agent {
437436
docker {
438437
image 'stanorg/ci:gpu'
439-
label 'linux'
438+
label 'linux && 8core'
440439
}
441440
}
442441
steps {
@@ -595,7 +594,7 @@ pipeline {
595594
agent {
596595
docker {
597596
image 'stanorg/ci:gpu'
598-
label 'linux'
597+
label 'linux && 8core'
599598
}
600599
}
601600
steps {
@@ -617,7 +616,7 @@ pipeline {
617616
echo "CXX=${env.CXX} -Werror " >> make/local
618617
"""
619618
withEnv(['PATH+TBB=./lib/tbb']) {
620-
try { sh "./runTests.py -j${env.PARALLEL} test/expressions" }
619+
try { sh "./runTests.py -j${PARALLEL} test/expressions" }
621620
finally { junit 'test/**/*.xml' }
622621
}
623622
}

0 commit comments

Comments
 (0)