Skip to content

Commit

Permalink
Use go run instead of compiling ginkgo explicitly
Browse files Browse the repository at this point in the history
  • Loading branch information
aramprice committed Mar 14, 2024
1 parent c8d29de commit f288b84
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 17 deletions.
2 changes: 1 addition & 1 deletion scripts/bosh-lite-acceptance-test
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ AGENT_HOST="$(bosh vms | grep running | grep bpm | awk '{print $4}')"
agent_port=1337

pushd "${release_dir}/src/bpm/acceptance" > /dev/null
ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
go run github.com/onsi/ginkgo/ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
popd > /dev/null

# We run the errand twice to make sure there is no state left on the VM which
Expand Down
8 changes: 1 addition & 7 deletions scripts/test-acceptance
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,10 @@ bosh deploy \
-v "stemcell_name=${STEMCELL_NAME}"

export RELEASE_PATH="$PWD/bpm-release"
export GOBIN="$RELEASE_PATH/bin"
export PATH="$PATH:$GOBIN"

pushd "${RELEASE_PATH}/src/bpm" > /dev/null
go install -mod=vendor github.com/onsi/ginkgo/ginkgo
popd

AGENT_HOST="$(bosh -d bpm instances | grep running | awk '{ print $4 }')"
agent_port=1337

pushd "${RELEASE_PATH}/src/bpm/acceptance" > /dev/null
ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
go run github.com/onsi/ginkgo/ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
popd > /dev/null
3 changes: 1 addition & 2 deletions scripts/test-unit
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ scripts_path=$(absolute_path "$(dirname "$0")" )
export RELEASE_PATH=$scripts_path/..

pushd "${RELEASE_PATH}/src/bpm" > /dev/null
go install -mod=vendor github.com/onsi/ginkgo/ginkgo
ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -skipPackage "acceptance" "$@"
go run github.com/onsi/ginkgo/ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -skipPackage "acceptance" "$@"
popd
8 changes: 1 addition & 7 deletions scripts/test-upgrade
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,10 @@ bosh deploy \
-v "stemcell_name=${STEMCELL_NAME}"

export RELEASE_PATH="$PWD/bpm-release"
export GOBIN="$RELEASE_PATH/bin"
export PATH="$PATH:$GOBIN"

pushd "${RELEASE_PATH}/src/bpm" > /dev/null
go install -mod=vendor github.com/onsi/ginkgo/ginkgo
popd

AGENT_HOST="$(bosh -d bpm instances | grep running | awk '{ print $4 }')"
agent_port=1337

pushd "${RELEASE_PATH}/src/bpm/acceptance" > /dev/null
ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
go run github.com/onsi/ginkgo/ginkgo -mod=vendor -r -p -race -randomizeAllSpecs -- --agent-uri="http://${AGENT_HOST}:${agent_port}"
popd > /dev/null

0 comments on commit f288b84

Please sign in to comment.