Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix for go 1.18 #10

Merged
merged 2 commits into from
Apr 13, 2022
Merged

fix for go 1.18 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef7314a
fix for go 1.18
acrmp Apr 7, 2022
d7f2c87
increasing the timeouts seems to help?
Apr 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions packages/blackbox-windows/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
View file
Open in desktop
Original file line number Diff line number Diff line change
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
View file
Open in desktop
Original file line number Diff line number Diff line change
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