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

codeowners, roachtest: merge sql-schema, sql-sessions to sql-foundations #102785

Merged
merged 1 commit into from
May 15, 2023
Merged

codeowners, roachtest: merge sql-schema, sql-sessions to sql-foundations #102785

merged 1 commit into from
May 15, 2023

Conversation

celiala
Copy link
Collaborator

@celiala celiala commented May 5, 2023 •
edited
Loading

Reflecting merge sql-schema, sql-sessions to sql-foundations in:

  • github CODEOWNERS
  • pkg/cmd/roachtest owners
  • TEAMS.yaml

Tests should pass once new team is created via https://github.com/cockroachlabs/crl-infrastructure/pull/775

This is a task for Part 2, below.

Tasks to update: GitHub Team name + GitHub Projects + Blathers

Part 1

Part 2

Part 3

Partial work for DEVINFHD-867
Release note: None
Epic: DEVINFHD-867

@cockroach-teamcity
Copy link
Member

This change is Reviewable

celiala
celiala commented May 5, 2023
View reviewed changes
TEAMS.yaml Outdated Show resolved Hide resolved
@celiala celiala force-pushed the sql-foundations.update-owners branch from 6663d60 to 0bcd964 Compare May 9, 2023 01:17
@celiala
Copy link
Collaborator Author

celiala commented May 9, 2023

blathers backport 23.1 22.2

@blathers-crl
Copy link

blathers-crl bot commented May 9, 2023

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 0bcd964bb11f1987b374762ed384aaf6c71bd9a5 to blathers/backport-release-23.1-102785: 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 23.1 failed. See errors above.

error creating merge commit from 0bcd964bb11f1987b374762ed384aaf6c71bd9a5 to blathers/backport-release-22.2-102785: 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.2 failed. See errors above.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@celiala celiala force-pushed the sql-foundations.update-owners branch from 0bcd964 to a219d52 Compare May 9, 2023 01:32
This was referenced May 9, 2023
Merged
Merged
@celiala celiala marked this pull request as ready for review May 9, 2023 16:36
@celiala celiala requested review from a team as code owners May 9, 2023 16:36
@celiala celiala requested review from herkolategan and renatolabs and removed request for a team May 9, 2023 16:36
jlinder
jlinder reviewed May 9, 2023
View reviewed changes
TEAMS.yaml Outdated
Comment on lines 26 to 28
cockroachdb/sql-syntax-prs: other
cockroachdb/sqlproxy-prs: other
cockroachdb/sql-api-prs: other
Copy link
Collaborator

Choose a reason for hiding this comment

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

Should these really be removed? They still exist.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ah, I didn't think through this. you're right:

  • I'll map these aliases over to the sql-foundations project (and apply to both this and the backports)

thank you for the catch!

Copy link
Collaborator Author

@celiala celiala May 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

TFTR! This is RFAL:

Changes made to TEAMS.yaml for the renamed cockroachdb/sql-foundations team:

  • aliases have been kept/mapped to the renamed cockroachdb/sql-foundations team
  • label for new T-sql-foundations team has been mapped to the renamed cockroachdb/sql-foundations team

These changes have been applied to master + both backports:

@celiala celiala force-pushed the sql-foundations.update-owners branch 3 times, most recently from 6435921 to 3280302 Compare May 9, 2023 21:39
rafiss
rafiss requested changes May 10, 2023
View reviewed changes
Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @celiala, @herkolategan, @jlinder, and @renatolabs)

TEAMS.yaml line 29 at r3 (raw file):

    cockroachdb/sqlproxy-prs: other
    cockroachdb/sql-api-prs: other
  triage_column_id: 8946818

i think the new triage column ID is 19467489

@celiala celiala force-pushed the sql-foundations.update-owners branch 3 times, most recently from c62b4c9 to 5ec9b4d Compare May 10, 2023 21:54
celiala
celiala commented May 10, 2023
View reviewed changes
Copy link
Collaborator Author

@celiala celiala left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @herkolategan, @jlinder, @rafiss, and @renatolabs)

TEAMS.yaml line 29 at r3 (raw file):

Previously, rafiss (Rafi Shamim) wrote…

i think the new triage column ID is 19467489

Done.

@celiala celiala requested a review from rafiss May 10, 2023 21:58
@celiala
codeowners, roachtest: merge SQL schema + sessions to SQL foundations
64a839b 
The SQL Schema and Sessions teams are merging to form SQL
Foundations. As described in DEVINFHD-867 we want to:

- reroute old teams to new sql-foundations team
- rename "SQL Schema" project to "SQL Foundations"
- deprecate "SQL Sessions" project

Release note: None
@celiala celiala force-pushed the sql-foundations.update-owners branch from 5ec9b4d to 64a839b Compare May 12, 2023 19:28
@celiala
Copy link
Collaborator Author

celiala commented May 12, 2023

TFTRs!

bors r+

@craig
Copy link
Contributor

craig bot commented May 12, 2023

👎 Rejected by code reviews

@celiala
Copy link
Collaborator Author

celiala commented May 15, 2023

TFTRs!

bors r=jlinder,rafiss

@craig
Copy link
Contributor

craig bot commented May 15, 2023

Build failed:

@celiala
Copy link
Collaborator Author

celiala commented May 15, 2023

bors r-

@celiala
Copy link
Collaborator Author

celiala commented May 15, 2023

bors r+

@craig
Copy link
Contributor

craig bot commented May 15, 2023

Build succeeded:

@craig craig bot merged commit 58fbcfb into cockroachdb:master May 15, 2023
@celiala
Copy link
Collaborator Author

celiala commented May 17, 2023

As discussed offline, even though we no longer have any scheduled 22.1 releases, Exalate will continue to produce errors if we don't apply changes to all affected branches. So we need to also apply this change to release-22.1:

#103536

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rafiss rafiss rafiss approved these changes

@jlinder jlinder jlinder approved these changes

@herkolategan herkolategan Awaiting requested review from herkolategan herkolategan is a code owner automatically assigned from cockroachdb/test-eng

@renatolabs renatolabs Awaiting requested review from renatolabs renatolabs is a code owner automatically assigned from cockroachdb/test-eng

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@celiala @cockroach-teamcity @jlinder @rafiss