mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-05 16:15:41 -06:00
Code Issues Packages Projects Releases 115 Wiki Activity

/benchmark/sql_regressions/run_regressions.sh: Fix silent exit

Browse Source
This commit is contained in:
Dustin Brown
2020-04-20 09:41:10 -07:00
parent 7b1e8182b8
commit dc825d3ec6
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
benchmark/sql_regressions/DoltRegressionsJenkinsfile
View File

@@ -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}"
}
}
}

2
benchmark/sql_regressions/run_regressions.sh
View File

@@ -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