From 5c5fe2e017584157df982da3c1a169df33a0784a Mon Sep 17 00:00:00 2001 From: Daylon Wilkins Date: Thu, 25 Jul 2019 11:47:39 -0700 Subject: [PATCH] Moved Windows test changes to new repo --- Jenkinsfile | 112 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 42 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 998f03a7a5..b283747d7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,54 +3,82 @@ pipeline { stages { stage('Test') { parallel { - stage ("go/") { +// stage ("go/") { +// agent { +// kubernetes { +// label "liquidata-inc-ld-build" +// } +// } +// environment { +// PATH = "${pwd()}/.ci_bin:${env.HOME}/go/bin:${env.PATH}" +// } +// steps { +// dir (".ci_bin") { +// sh "go get golang.org/x/tools/cmd/goimports" +// } +// dir ("go") { +// sh "go get -mod=readonly ./..." +// sh "./utils/repofmt/check_fmt.sh" +// sh "./Godeps/verify.sh" +// sh "./utils/checkcommitters/check_pr.sh" +// sh "go vet -mod=readonly ./..." +// sh "go run -mod=readonly ./utils/copyrightshdrs/" +// sh "go test -mod=readonly -test.v ./..." +// } +// } +// } +// stage ("bats/") { +// agent { +// kubernetes { +// label "liquidata-inc-ld-build" +// } +// } +// environment { +// PATH = "${pwd()}/.ci_bin:${pwd()}/.ci_bin/node_modules/.bin:${env.PATH}" +// } +// steps { +// dir (".ci_bin") { +// sh "npm i bats" +// } +// dir ("go") { +// sh "go get -mod=readonly ./..." +// sh "go build -mod=readonly -o ../.ci_bin/dolt ./cmd/dolt/." +// sh "go build -mod=readonly -o ../.ci_bin/git-dolt ./cmd/git-dolt/." +// sh "go build -mod=readonly -o ../.ci_bin/git-dolt-smudge ./cmd/git-dolt-smudge/." +// sh "go build -mod=readonly -o ../.ci_bin/remotesrv ./utils/remotesrv/." +// } +// sh "dolt config --global --add user.name 'Liquidata Jenkins'" +// sh "dolt config --global --add user.email 'jenkins@liquidata.co'" +// dir ("bats") { +// sh "bats ." +// } +// } +// } + stage ("Windows dolt") { agent { - kubernetes { - label "liquidata-inc-ld-build" - } + label "windows" } environment { - PATH = "${pwd()}/.ci_bin:${env.HOME}/go/bin:${env.PATH}" + GIT_SSH_KEYFILE = credentials("liquidata-inc-ssh") + PATH = "C:\\msys64\\mingw64\\bin;${pwd()}\\.ci_bin;${env.PATH}" } steps { - dir (".ci_bin") { - sh "go get golang.org/x/tools/cmd/goimports" + dir ("dolt/go") { + bat "go test ./..." + bat "go build -mod=readonly -o ..\\..\\.ci_bin\\dolt.exe ./cmd/dolt/." + bat "copy /Y ..\\..\\.ci_bin\\dolt.exe ..\\..\\.ci_bin\\dolt" + bat "go build -mod=readonly -o ..\\..\\.ci_bin\\git-dolt.exe ./cmd/git-dolt/." + bat "copy /Y ..\\..\\.ci_bin\\git-dolt.exe ..\\..\\.ci_bin\\git-dolt" + bat "go build -mod=readonly -o ..\\..\\.ci_bin\\git-dolt-smudge.exe ./cmd/git-dolt-smudge/." + bat "copy /Y ..\\..\\.ci_bin\\git-dolt-smudge.exe ..\\..\\.ci_bin\\git-dolt-smudge" + bat "go build -mod=readonly -o ..\\..\\.ci_bin\\remotesrv.exe ./utils/remotesrv/." + bat "copy /Y ..\\..\\.ci_bin\\remotesrv.exe ..\\..\\.ci_bin\\remotesrv" + bat "setLocal EnableDelayedExpansion && pushd %LOCALAPPDATA%\Temp && del /q/f/s .\* >nul 2>&1 && rmdir /s/q . >nul 2>&1 && popd" } - dir ("go") { - sh "go get -mod=readonly ./..." - sh "./utils/repofmt/check_fmt.sh" - sh "./Godeps/verify.sh" - sh "./utils/checkcommitters/check_pr.sh" - sh "go vet -mod=readonly ./..." - sh "go run -mod=readonly ./utils/copyrightshdrs/" - sh "go test -mod=readonly -test.v ./..." - } - } - } - stage ("bats/") { - agent { - kubernetes { - label "liquidata-inc-ld-build" - } - } - environment { - PATH = "${pwd()}/.ci_bin:${pwd()}/.ci_bin/node_modules/.bin:${env.PATH}" - } - steps { - dir (".ci_bin") { - sh "npm i bats" - } - dir ("go") { - sh "go get -mod=readonly ./..." - sh "go build -mod=readonly -o ../.ci_bin/dolt ./cmd/dolt/." - sh "go build -mod=readonly -o ../.ci_bin/git-dolt ./cmd/git-dolt/." - sh "go build -mod=readonly -o ../.ci_bin/git-dolt-smudge ./cmd/git-dolt-smudge/." - sh "go build -mod=readonly -o ../.ci_bin/remotesrv ./utils/remotesrv/." - } - sh "dolt config --global --add user.name 'Liquidata Jenkins'" - sh "dolt config --global --add user.email 'jenkins@liquidata.co'" - dir ("bats") { - sh "bats ." + dir ("dolt/bats") { + bat "dolt config --global --add user.name \"Liquidata Jenkins\"" + bat "dolt config --global --add user.email \"jenkins@liquidata.co\"" + bat "C:\\wsl.exe /mnt/c/bats/libexec/bats `pwd`" } } }