diff --git a/packages/blackbox-windows/spec b/packages/blackbox-windows/spec index 964a111..cb99534 100644 --- a/packages/blackbox-windows/spec +++ b/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 diff --git a/scripts/test b/scripts/test index 541c531..97cbb59 100755 --- a/scripts/test +++ b/scripts/test @@ -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 diff --git a/tests/boshhelpers_test.go b/tests/boshhelpers_test.go index 694af39..4d6ab11 100644 --- a/tests/boshhelpers_test.go +++ b/tests/boshhelpers_test.go @@ -30,7 +30,7 @@ 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())) } @@ -38,7 +38,7 @@ 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 }