From 6158e15ef093480350747d7a5072dec7fbfd92d5 Mon Sep 17 00:00:00 2001 From: Andy Pavlo Date: Fri, 3 Jul 2020 14:44:28 -0400 Subject: [PATCH] Quick fix for broken Jenkinsfile. I edited this file directly on GitHub without testing it first. Don't do what Andy did, kids. I'm not proud of this --- Jenkinsfile | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 924e22b0a2..a203b81a5d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -352,7 +352,17 @@ pipeline { } } } - + stage('End-to-End Performance') { + agent { label 'benchmark' } + steps { + sh 'echo $NODE_NAME' + sh 'echo y | sudo ./script/installation/packages.sh all' + sh 'mkdir build' + sh 'cd build && cmake -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Release -DTERRIER_USE_ASAN=OFF -DTERRIER_USE_JEMALLOC=ON -DTERRIER_BUILD_TESTS=OFF .. && make -j$(nproc) terrier' + sh "cd build && python3 ../script/testing/oltpbench/run_oltpbench.py tatp 2,35,10,35,2,14,2 --build-type=release \ + --loader-threads=4 --client-time=60 --terminals=8" + } + } stage('Microbenchmark') { agent { label 'benchmark' } steps { @@ -373,16 +383,5 @@ pipeline { } } } - stage('Performance') { - agent { label: 'benchmark' } - steps { - sh 'echo $NODE_NAME' - sh 'echo y | sudo ./script/installation/packages.sh all' - sh 'mkdir build' - sh 'cd build && cmake -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Release -DTERRIER_USE_ASAN=OFF -DTERRIER_USE_JEMALLOC=ON -DTERRIER_BUILD_TESTS=OFF .. && make -j$(nproc) terrier' - sh "cd build && python3 ../script/testing/oltpbench/run_oltpbench.py tatp 2,35,10,35,2,14,2 --build-type=release \ - --loader-threads=4 --client-time=60 --terminals=8" - } - } } }