Skip to content

Commit 3268552

Browse files
committed
Install gotestsum via curl
1 parent e5400ab commit 3268552

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Jenkinsfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ pipeline {
197197
expression { return params.KUBERNETES_TESTS }
198198
}
199199
steps {
200-
sh "go install gotest.tools/gotestsum@latest; make test dockerImage=marklogic-centos/marklogic-server-centos:${dockerVersion} saveOutput=true path=./bin/"
200+
sh """curl -sSL "https://github.com/gotestyourself/gotestsum/releases/download/v0.3.1/gotestsum_0.3.1_linux_amd64.tar.gz" | tar -xz -C /usr/local/bin gotestsum
201+
make test dockerImage=marklogic-centos/marklogic-server-centos:${dockerVersion} saveOutput=true"""
201202
}
202203
}
203204
}

makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ lint:
8181
## Options:
8282
## * [dockerImage] optional. default is marklogicdb/marklogic-db:latest. Example: dockerImage=marklogic-centos/marklogic-server-centos:10-internal
8383
## * [saveOutput] optional. Save the output to a xml file. Example: saveOutput=true
84-
## * [path] optional. path to gotestsum executable. Example: path=/home/builder/go/bin/
8584
.PHONY: e2e-test
8685
e2e-test: prepare
8786
@echo "=====Installing minikube cluster"
@@ -91,7 +90,7 @@ e2e-test: prepare
9190
minikube image load $(dockerImage)
9291

9392
@echo "=====Running e2e tests"
94-
cd test; $(if $(saveOutput),$(if $(path),$(path),)gotestsum --junitfile test_results/e2e-tests.xml ./e2e/... -count=1, go test -v -count=1 ./test/e2e/...)
93+
cd test; $(if $(saveOutput),gotestsum --junitfile test_results/e2e-tests.xml ./e2e/... -count=1, go test -v -count=1 ./test/e2e/...)
9594

9695
@echo "=====Delete minikube cluster"
9796
minikube delete
@@ -104,7 +103,7 @@ e2e-test: prepare
104103
.PHONY: template-test
105104
template-test: prepare
106105
@echo "=====Running template tests"
107-
cd test; $(if $(saveOutput), $(if $(path),$(path),)gotestsum --junitfile test_results/testplate-tests.xml ./template/... -count=1, go test -v -count=1 ./test/template/...)
106+
cd test; $(if $(saveOutput),gotestsum --junitfile test_results/testplate-tests.xml ./template/... -count=1, go test -v -count=1 ./test/template/...)
108107

109108
#***************************************************************************
110109
# test

0 commit comments

Comments
 (0)