From df1c8fbe544911d7946ac8230c8bbd4e37aa66aa Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Thu, 26 Mar 2020 07:57:48 -0700 Subject: [PATCH] /benchmark/sql_regressions/DoltReleaseBenchmarkJenkinsfile: Install from release --- .../DoltReleaseBenchmarkJenkinsfile | 16 ++++++++-------- benchmark/sql_regressions/run_regressions.sh | 7 ++++++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/benchmark/sql_regressions/DoltReleaseBenchmarkJenkinsfile b/benchmark/sql_regressions/DoltReleaseBenchmarkJenkinsfile index 0695f98fc3..2b4ff311e8 100644 --- a/benchmark/sql_regressions/DoltReleaseBenchmarkJenkinsfile +++ b/benchmark/sql_regressions/DoltReleaseBenchmarkJenkinsfile @@ -15,18 +15,18 @@ pipeline { DOLT_ROOT_PATH="${pwd()}/tempRoot" DOLT_CREDS = credentials("system-account-dolthub-creds") DOLT_GLOBAL_CONFIG = credentials("system-account-dolthub-config") + DOLT_RELEASE_URL = "https://github.com/liquidata-inc/dolt/releases/download/v\"$DOLT_RELEASE\"/dolt-linux-amd64.tar.gz" } steps { sh "rm -rf $TMPDIR && mkdir $TMPDIR" sh "rm -rf $DOLT_ROOT_PATH && mkdir $DOLT_ROOT_PATH" - dir ("dolt-release") { - checkout([$class: 'GitSCM', branches: [[name: "${DOLT_RELEASE}"]], - userRemoteConfigs: [[url: 'https://github.com/liquidata-inc/dolt.git']]]) - } - dir ("dolt-release/go") { - sh "go get -mod=readonly ./..." - sh "go build -mod=readonly -o ../../.ci_bin/dolt ./cmd/dolt/." - } + sh """ + curl -A CURL_USER_AGENT:-dolt-installer -fsL "$DOLT_RELEASE_URL" > dolt.tar.gz + tar zxf dolt.tar.gz + rm -rf ./.ci_bin && mkdir ./.ci_bin + install dolt-linux-amd64/bin/dolt ./.ci_bin/ + dolt version + """ dir ("sqllogictest") { git url: "https://github.com/liquidata-inc/sqllogictest.git" } diff --git a/benchmark/sql_regressions/run_regressions.sh b/benchmark/sql_regressions/run_regressions.sh index fc2f2fd37c..1498f80563 100755 --- a/benchmark/sql_regressions/run_regressions.sh +++ b/benchmark/sql_regressions/run_regressions.sh @@ -115,10 +115,15 @@ select * from releases_dolt_mean_results;\ } function rebuild_dolt() { + echo "Removing dolt version $DOLT_VERSION..." + rm ../../.ci_bin/dolt + echo "Rebuilding dolt from current checkout..." pushd ../../go && \ + pwd go get -mod=readonly ./... && \ - go build -mod=readonly -o ../../.ci_bin/dolt ./cmd/dolt/. && \ + go build -mod=readonly -o ../.ci_bin/dolt ./cmd/dolt/. && \ popd + dolt version } function import_one_releases() {