diff --git a/benchmark/sql_regressions/DoltRegressionsJenkinsfile b/benchmark/sql_regressions/DoltRegressionsJenkinsfile index cc1b0d8e55..d3d98c4353 100644 --- a/benchmark/sql_regressions/DoltRegressionsJenkinsfile +++ b/benchmark/sql_regressions/DoltRegressionsJenkinsfile @@ -24,7 +24,13 @@ pipeline { git url: "https://github.com/liquidata-inc/sqllogictest.git" } dir ("benchmark/sql_regressions") { - sh "nice ./run_regressions.sh ./nightly.vars" + script { + try { + sh "nice ./run_regressions.sh ./nightly.vars" + } catch(err) { + sh "if [ \"${err.getMessage()}\" = 'script returned exit code 155' ]; then echo 'Result data found in dolt-sql-performance, silently exiting...'; else echo \"${err.getMessage()}\" && exit 1; fi" + } + } } } } @@ -38,14 +44,9 @@ pipeline { } } failure { - script { - def watchers = "$SQL_WATCHERS".split() - for (int i = 0; i < watchers.size(); ++i) { - emailext body: "${currentBuild.currentResult}: Job ${env.JOB_NAME} build ${env.BUILD_NUMBER}\n More info at: ${env.BUILD_URL}", - to: watchers[i], - subject: "Jenkins Build ${currentBuild.currentResult}: Job ${env.JOB_NAME}" - } - } + emailext body: "${currentBuild.currentResult}: Job ${env.JOB_NAME} build ${env.BUILD_NUMBER}\n More info at: ${env.BUILD_URL}", + to: "$SQL_WATCHERS", + subject: "Jenkins Build ${currentBuild.currentResult}: Job ${env.JOB_NAME}" } } } diff --git a/benchmark/sql_regressions/run_regressions.sh b/benchmark/sql_regressions/run_regressions.sh index f3e0b870de..0bd153ef50 100755 --- a/benchmark/sql_regressions/run_regressions.sh +++ b/benchmark/sql_regressions/run_regressions.sh @@ -82,7 +82,7 @@ function check_version_exists() { if [ "$previously_tested_version" != 1 ]; then echo "Results for dolt version $DOLT_VERSION already exist in Liquidata/dolt-sql-performance, $previously_tested_version != 1" && \ echo $result_query_output && \ - exit 0; + exit 155; fi dolt checkout master