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.

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

Fix/ginkgo v2 #731

Merged
merged 4 commits into from
Apr 10, 2023
Merged

Conversation

dsabeti
Copy link
Contributor

@dsabeti dsabeti commented Apr 10, 2023

Thank you for submitting a pull request to the diego-release repository. We appreciate the contribution. To help us with getting better context for the pull request please follow these guidelines:

Please make sure to complete the following steps

  • Before PR Submission, Submit an issue for either an Enhancement or Bug
  • Check the Contributing document on how to sign the CLA and run tests in diego-release.
  • Make sure a pull request is done against the develop branch.

Issue Link

Please link the issue you created above for a bug or enhancement.

Thank you!

winkingturtle-vmw and others added 4 commits April 6, 2023 19:47
bump auction auctioneer bbs buildpackapplifecycle bytefmt cacheddownloader cfdot diego-ssh dockerapplifecycle dockerdriver ecrhelper executor fileserver goshims healthcheck inigo localdriver locket operationq rep route-emitter routing-api routing-info systemcerts trace-logger vizzini volman workpool garden grootfs guardian idmapper

Submodule src/code.cloudfoundry.org/auction f4db6c51a..20b5e4eb0:
  > Bump to ginkgo/v2 and lager/v3 (cloudfoundry#10)
Submodule src/code.cloudfoundry.org/auctioneer 7b69d26e0..6757f6637:
  > Bump to ginkgo/v2 and lager/v3 (cloudfoundry#11)
Submodule src/code.cloudfoundry.org/bbs 952b49bde..41bd09f9f:
  > fix for `go vet` failures (cloudfoundry#63)
  > Bump to lager/v3 (remaining)
  > Bump sqldb/helpers + test helpers to lager v3 (cloudfoundry#61)
  > Bump to ginkgo/v2
Submodule src/code.cloudfoundry.org/buildpackapplifecycle 9bfd77998..b3c0aa499:
  > Merge pull request cloudfoundry#61 from cloudfoundry/with-ginkgo-v2
  > Merge pull request cloudfoundry#59 from cloudfoundry/develop
Submodule src/code.cloudfoundry.org/cacheddownloader 456a733fa..3de1f8d2e:
  > Bump to ginkgo/v2 and lager/v3 (cloudfoundry#23)
Submodule src/code.cloudfoundry.org/cfdot f68fa7f78..9c6e1b442:
  > Bump to ginkgo/v2 and lager/v3 (cloudfoundry#6)
Submodule src/code.cloudfoundry.org/diego-ssh 0fc4f3a7d..1003fb588:
  > Bump to ginkgo/v2 and lager/v3 (cloudfoundry#47)
Submodule src/code.cloudfoundry.org/dockerapplifecycle 163faedf6..36aa90971:
  > Bump to ginkgo/v2 (cloudfoundry#11)
  > Regenerate test certificates
Submodule src/code.cloudfoundry.org/dockerdriver 16e1fe9ba..76bff1bc5:
  > Bump to ginkgo/v2 and lager/v3 (cloudfoundry#3)
  > Update PULL_REQUEST_TEMPLATE.md
  > content change
Submodule src/code.cloudfoundry.org/ecrhelper 9a7c7e5a9..3949c0207:
  > Bump to ginkgo/v2 (cloudfoundry#2)
Submodule src/code.cloudfoundry.org/executor 1e5a6f15b..208a08c51:
  > With ginkgo v2 and lager/v3 (cloudfoundry#75)
  > Ensure we release info lock when marshaling fails
  > Update garden container logging tags
  > Fix typo in function name
  > Fetch all containers for cleanup
  > Executor releases resources only when a container is successfully deleted
Submodule src/code.cloudfoundry.org/fileserver 11af6ea87..f3dfda90a:
  > Bump to ginkgo/v2 && lager/v3 (cloudfoundry#7)
Submodule src/code.cloudfoundry.org/goshims bb24d2ef7..cf8c6ba6c:
  > Bump golang.org/x/net from 0.7.0 to 0.8.0 (cloudfoundry#24)
  > Bump golang.org/x/net from 0.0.0-20200301022130-244492dfa37a to 0.7.0 (cloudfoundry#23)
  > Bump github.com/go-sql-driver/mysql from 1.6.0 to 1.7.0 (cloudfoundry#22)
  > Bump github.com/go-sql-driver/mysql from 1.5.0 to 1.6.0 (cloudfoundry#21)
  > Revert "Bump github.com/go-sql-driver/mysql from 1.5.0 to 1.6.0 (cloudfoundry#19)" (cloudfoundry#20)
  > Bump github.com/go-sql-driver/mysql from 1.5.0 to 1.6.0 (cloudfoundry#19)
  > Merge pull request cloudfoundry#18 from cloudfoundry/dependabot/add-v2-config-file
  > Merge pull request cloudfoundry#17 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.36.0
  > Merge pull request cloudfoundry#16 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.35.0
  > Merge pull request cloudfoundry#15 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.34.1
  > Merge pull request cloudfoundry#14 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.34.0
  > Merge pull request cloudfoundry#13 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.33.2
  > Merge pull request cloudfoundry#12 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.33.1
  > Merge pull request cloudfoundry#11 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.32.0
  > Merge pull request cloudfoundry#10 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.31.1
  > Merge pull request cloudfoundry#9 from cloudfoundry/dependabot/go_modules/master/google.golang.org/grpc-1.31.0
  > Merge pull request cloudfoundry#8 from cloudfoundry/dependabot/go_modules/google.golang.org/grpc-1.30.0
  > go mod vendor
  > Merge pull request cloudfoundry#7 from cloudfoundry/dependabot/go_modules/google.golang.org/grpc-1.29.1
  > 🤖 go mod vendor
  > go get -u all
  > Add gitignore file
  > Convert to go modules
  > Add SetEnv to the command interface
Submodule src/code.cloudfoundry.org/healthcheck d7f787b20..7670cbf97:
  > Bump to ginkgo/v2 (cloudfoundry#9)
Submodule src/code.cloudfoundry.org/inigo 18bab030e..3c8b1a8f8:
  > Bump to ginkgo/v2 & lager/v3 (cloudfoundry#25)
Submodule src/code.cloudfoundry.org/localdriver 1b0a47b1c..0668dcc60:
  > Bump to ginkgo/v2 & lager/v3 (cloudfoundry#2)
Submodule src/code.cloudfoundry.org/locket 76a930295..5e8522d97:
  > {fake_runner,fake_runner_v2} to be used with (cloudfoundry#14)
  > Add BeforeSuite in the right place
  > Fix govet errors
  > Bump to lager v3
  > WIP - upgrading to ginkgo v2+ ginkgomon_v2
Submodule src/code.cloudfoundry.org/operationq da3eb228f..4522d0860:
  > Bump to ginkgo/v2 (cloudfoundry#2)
  > Fix the test for max capacity
  > Ginkgo v2: don't use Done channels
  > Update PULL_REQUEST_TEMPLATE.md
  > content change
Submodule src/code.cloudfoundry.org/rep be8beeb46..f627e21dd:
  > Bump to ginkgo/v2 && lager/v3 (cloudfoundry#39)
Submodule src/code.cloudfoundry.org/route-emitter c907cd8f6..da039b0c1:
  > Bump to ginkgo/v2 && lager/v3 (cloudfoundry#21)
Submodule src/code.cloudfoundry.org/routing-api ff096da8d..2bf566855:
  > Fix ginkgo deprecations with Done channels
  > Fix ginkgo v2 flag deprecation notices
  > Bump to lager v3
  > Convert  to ginkgo v2 + inline the archived trace package
  > Convert to ginkgo v2 + inline the archived trace package
  > ignore .test files in the repo
  > Bump to ginkgo/v2
  > Bump to ginkgo/v2 - WIP
  > Allow uaaclient callers to optionally pass in a protocol via (cloudfoundry#30)
Submodule src/code.cloudfoundry.org/routing-info 7d023ecb0..c6998d604:
  > Bump to ginkgo/v2
Submodule src/code.cloudfoundry.org/systemcerts 95ea366d9..5244fcb1b:
  > refactor: rm use of internal/testenv
Submodule src/code.cloudfoundry.org/vizzini a59096109...6474f903a:
  > fix `go vet` failures
  > Bump to ginkgo/v2 && lager/v3
  < Fix one more test using metric tags
Submodule src/code.cloudfoundry.org/volman 4129b3172..76091d503:
  > Bump to ginkgo/v2 && lager/v3 (cloudfoundry#5)
Submodule src/code.cloudfoundry.org/workpool e8b9128ee..2e26d5d93:
  > Bump to ginkgo/v2 (cloudfoundry#2)
  > Update PULL_REQUEST_TEMPLATE.md
  > content change
Submodule src/garden d57de807d..8534099e1:
  > Migrate to lager v3
  > Migrate to ginkgo/v2
  > Bump lager to latest on master
  > Revert "bump ginkgo to v2 and lager to v3"
  > Merge pull request cloudfoundry#107 from xtremerui/bump-ginkgo-lager
  > Bump golang.org/x/net from 0.0.0-20210428140749-89ef3d95e781 to 0.7.0
  > Merge pull request cloudfoundry#105 from cloudfoundry/unpin-components
  > Merge pull request cloudfoundry#103 from ebroberson/ginkgov2-done-channels
Submodule src/grootfs ba02da43d..df476b3ba:
  > Swtch to channels from pool
  > Return to pool xfs mounts that don't cause test pollution
  > Generate 10 mount points for all quota tests
  > Use unique mount directory for each test
  > Merge pull request cloudfoundry#197 from cloudfoundry/with-ginkgo-v2
  > go mod tidy && vendor
  > Bump lager to latest on master
  > 🔒 dep
  > Merge pull request cloudfoundry#196 from cloudfoundry/unpin-components
  > Bump golang.org/x/sys from 0.5.0 to 0.6.0
  > go mod tidy
  > Merge remote-tracking branch 'local/dependabot/go_modules/code.cloudfoundry.org/lager-2.0.0incompatible' into main
  > Merge remote-tracking branch 'local/dependabot/go_modules/github.com/containers/image/v5-5.24.2' into main
  > Merge remote-tracking branch 'local/dependabot/go_modules/github.com/docker/docker-23.0.1incompatible' into main
  > Merge remote-tracking branch 'local/dependabot/go_modules/golang.org/x/sys-0.5.0' into main
  > Bump github.com/opencontainers/runtime-spec
  > Merge pull request cloudfoundry#191 from cloudfoundry/out-of-disk-error-with-jammy
Submodule src/guardian 913b899bc..86f0a7d78:
  > Set container properties before creating container
  > Containers() returns all containers when garden.state is all
  > Merge pull request cloudfoundry#364 from cloudfoundry/with-ginkgo-v2
  > go mod tidy && vendor
  > Bump lager to latest on master
  > use typeurl/v2
  > 🔓 dep
  > go mod tidy and vendor
  > go mod tidy
  > go mod tidy
  > Merge pull request cloudfoundry#361 from cloudfoundry/dependabot/go_modules/github.com/cloudfoundry/gosigar-1.3.9
  > Merge pull request cloudfoundry#363 from cloudfoundry/dependabot/go_modules/github.com/onsi/gomega-1.27.4
  > Merge pull request cloudfoundry#362 from cloudfoundry/dependabot/go_modules/github.com/containerd/containerd-1.7.0
  > Merge pull request cloudfoundry#345 from cloudfoundry/dependabot/go_modules/github.com/emicklei/go-restful-2.16.0incompatible
  > Merge pull request cloudfoundry#359 from cloudfoundry/unpin-components
  > Update path to remove unneeded bin dir
  > Remove runc pin
  > Add runc to build package
  > go mod tidy
  > Merge pull request cloudfoundry#355 from cloudfoundry/dependabot/go_modules/github.com/containerd/containerd-1.6.19
Submodule src/idmapper a23279655..390987bf5:
  > Bump github.com/onsi/ginkgo/v2 from 2.9.0 to 2.9.1
  > Merge pull request cloudfoundry#65 from cloudfoundry/unpin-components
  > Bump github.com/onsi/ginkgo/v2 from 2.8.4 to 2.9.0
  > Bump github.com/onsi/ginkgo/v2 from 2.8.3 to 2.8.4
  > Bump github.com/onsi/ginkgo/v2 from 2.7.0 to 2.8.3
  > Bump github.com/onsi/ginkgo/v2 from 2.6.1 to 2.7.0
  > Bump github.com/onsi/ginkgo/v2 from 2.6.0 to 2.6.1
  > Bump github.com/onsi/ginkgo/v2 from 2.5.1 to 2.6.0
  > Bump github.com/onsi/ginkgo/v2 from 2.5.0 to 2.5.1
  > Bump github.com/onsi/ginkgo/v2 from 2.4.0 to 2.5.0
  > Bump github.com/onsi/ginkgo/v2 from 2.3.1 to 2.4.0
  > Bump github.com/onsi/ginkgo/v2 from 2.3.0 to 2.3.1
  > Bump github.com/onsi/ginkgo/v2 from 2.2.0 to 2.3.0
  > Bump github.com/onsi/ginkgo/v2 from 2.1.6 to 2.2.0
  > Bump github.com/onsi/ginkgo/v2 from 2.1.5 to 2.1.6
  > Bump github.com/onsi/ginkgo/v2 from 2.1.4 to 2.1.5
benchmark-bbs required more changes for ginkgo/v2 work, and since we are
not running this job in CI, we just removed it and can bring it
back and fix ginkgo/v2 changes if we decide to run it again.

Signed-off-by: Nick Rohn <nrohn@vmware.com>
Submodule src/garden 8534099e1..d69f60dce:
  > Remove lager v1 from vendor/modules.txt
Submodule src/grootfs df476b3ba..e086cccca:
  > Run go mod vendor to clean modules.txt
  > Escape regexp characters
  > Change quotes to avoid interpolation as regular expression
  > Migrate to lager v3
Submodule src/guardian 86f0a7d78..7df66ce76:
  > Bump to lager v3
  > Remove done channels
to get rid of last vestige of lager v1
@dsabeti dsabeti mentioned this pull request Apr 10, 2023
@winkingturtle-vmw winkingturtle-vmw merged commit 74058f5 into cloudfoundry:develop Apr 10, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants