Skip to content

acceptance: fix, un-skip TestComposeGSS#85474

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
rickystewart:fixgsstest
Aug 3, 2022
Merged

acceptance: fix, un-skip TestComposeGSS#85474
craig[bot] merged 1 commit intocockroachdb:masterfrom
rickystewart:fixgsstest

Conversation

@rickystewart
Copy link
Copy Markdown
Collaborator

@rickystewart rickystewart commented Aug 2, 2022

  • Add go.mod file for pkg/acceptance/compose/gss/psql for pinning.
  • Remove dependency on cockroach via
    pkg/acceptance/compose/gss/psql.

Fixes #84981.

Release note: None

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@rickystewart rickystewart force-pushed the fixgsstest branch 2 times, most recently from 02bded0 to 5fcdf12 Compare August 2, 2022 16:51
@rickystewart rickystewart changed the title bazel: fix, un-skip TestComposeGSS acceptance: fix, un-skip TestComposeGSS Aug 2, 2022
@rickystewart rickystewart force-pushed the fixgsstest branch 9 times, most recently from 044ca2f to f20dfc2 Compare August 2, 2022 22:38
@rickystewart rickystewart marked this pull request as ready for review August 2, 2022 22:39
@rickystewart rickystewart requested a review from a team August 2, 2022 22:39
@rickystewart rickystewart requested a review from a team as a code owner August 2, 2022 22:39
@rickystewart rickystewart requested a review from knz August 2, 2022 22:39
@rickystewart rickystewart force-pushed the fixgsstest branch 2 times, most recently from 4827a90 to ce10ebe Compare August 2, 2022 22:58
* Add `go.mod` file for `pkg/acceptance/compose/gss/psql` for pinning.
* Remove dependency on `cockroach` via
  `pkg/acceptance/compose/gss/psql`.

Fixes cockroachdb#84981.

Release note: None
Copy link
Copy Markdown
Contributor

@knz knz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is very good. 💯 Thanks ricky!

@knz
Copy link
Copy Markdown
Contributor

knz commented Aug 3, 2022

I'll love to see this backported as far as v21.1 so we can still issue backports for fixes there

@rickystewart
Copy link
Copy Markdown
Collaborator Author

bors r=knz

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 3, 2022

Build failed (retrying...):

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 3, 2022

Build succeeded:

@craig craig bot merged commit 0a71722 into cockroachdb:master Aug 3, 2022
@blathers-crl
Copy link
Copy Markdown

blathers-crl bot commented Aug 3, 2022

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 435642a to blathers/backport-release-22.1-85474: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 22.1.x failed. See errors above.


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

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.

acceptance: TestComposeGSS broken with Go 1.17

3 participants