Skip to content

Commit

Permalink
fix for go 1.18 (#10)
Browse files Browse the repository at this point in the history
* fix for go 1.18

- letting the pipeline do the actual golang bump and tests

- go tries to include git information but stemcells do not include git binary
  golang/go#51748

- go install instead of go get for installing in go 1.18

Signed-off-by: Ben Fuller <benjaminf@vmware.com>
Co-authored-by: Ben Fuller <benjaminf@vmware.com>

* increasing the timeouts seems to help?

Co-authored-by: Andrew Crump <crumpan@vmware.com>
  • Loading branch information
Benjamin Fuller and acrmp committed Apr 13, 2022
1 parent 00e2668 commit bc77e43
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
6 changes: 4 additions & 2 deletions packages/blackbox-windows/spec
@@ -1,6 +1,8 @@
---
name: blackbox-windows
dependencies:
- golang-1-windows
- golang-1-windows
files:
- blackbox/**/*
- blackbox/**/*
excluded_files:
- blackbox/.git
8 changes: 4 additions & 4 deletions scripts/test
Expand Up @@ -6,11 +6,11 @@ pushd "$(dirname "$0")/.."
bosh create-release --force --version="$(date "+%s")"
bosh upload-release
popd
bosh upload-stemcell --sha1 256e2629f2f949d3fc1b9f03a4b9f60ce88520a8 https://bosh.io/d/stemcells/bosh-google-kvm-windows2019-go_agent?v=2019.36
bosh upload-release --sha1 9bf48ad25843e29dc76437fe89a35c550746fd22 https://bosh.io/d/github.com/cloudfoundry/syslog-release?v=11.7.0
bosh upload-release --sha1 7886ffd43b84d4eced06560ba601ce1eb97c6616 https://bosh.io/d/github.com/cloudfoundry-incubator/windows-utilities-release?v=0.14.0
bosh upload-stemcell https://bosh.io/d/stemcells/bosh-google-kvm-windows2019-go_agent
bosh upload-release https://bosh.io/d/github.com/cloudfoundry/syslog-release
bosh upload-release https://bosh.io/d/github.com/cloudfoundry-incubator/windows-utilities-release

go get -u github.com/onsi/ginkgo/ginkgo
pushd "$(dirname "$0")/../tests"
go install github.com/onsi/ginkgo/ginkgo@latest
ginkgo -r -nodes=2 "$@"
popd
4 changes: 2 additions & 2 deletions tests/boshhelpers_test.go
Expand Up @@ -30,15 +30,15 @@ func BoshCmd(args ...string) *gexec.Session {
func Cleanup() {
BoshCmd("locks")
session := BoshCmd("delete-deployment")
Eventually(session, 15*time.Minute).Should(gexec.Exit(0))
Eventually(session, 30*time.Minute).Should(gexec.Exit(0))
Eventually(BoshCmd("locks")).ShouldNot(gbytes.Say(DeploymentName()))
}

func Deploy(manifest string) *gexec.Session {
session := BoshCmd("deploy", manifest,
"-v", fmt.Sprintf("deployment=%s", DeploymentName()),
fmt.Sprintf("--vars-store=/tmp/%s-vars.yml", DeploymentName()))
Eventually(session, 15*time.Minute).Should(gexec.Exit(0))
Eventually(session, 30*time.Minute).Should(gexec.Exit(0))
Eventually(BoshCmd("locks")).ShouldNot(gbytes.Say(DeploymentName()))
return session
}
Expand Down

0 comments on commit bc77e43

Please sign in to comment.