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

release-20.2: cmd: wholesale replace roachprod, roachtest, workload from master #55899

Merged
merged 1 commit into from
Nov 2, 2020

Conversation

adityamaru
Copy link
Contributor

Informs: #51897

@adityamaru adityamaru requested a review from jlinder October 23, 2020 15:14
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@adityamaru adityamaru added the do-not-merge bors won't merge a PR with this label. label Oct 23, 2020
@adityamaru adityamaru changed the title cmd: wholesale replace roachprod, roachtest, workload from master release-20.2: cmd: wholesale replace roachprod, roachtest, workload from master Oct 29, 2020
@@ -22,6 +22,7 @@ func registerInconsistency(r *testRegistry) {
r.Add(testSpec{
Name: fmt.Sprintf("inconsistency"),
Owner: OwnerKV,
Skip: "Uses RocksDB put command; unskip when that's bypassed",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

TODO(adityamaru): Check if this has been unskipped since I picked the version of roachtest from master.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For consistency, I am going to rely on engineers backporting all their changes since October 22nd themselves. I will ping storage since this caught my eye but I suspect there could be others.

@adityamaru
Copy link
Contributor Author

@irfansharif I've not tagged the PRs corresponding to the changes to the roachtests in this branch since the diff is a lot smaller. If you think it'll help I'm happy to do it!
Waiting on #56136 for CI to be green.

Copy link
Contributor

@irfansharif irfansharif left a comment

Choose a reason for hiding this comment

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

LGTM.

I've not tagged the PRs corresponding to the changes to the roachtests in this branch since the diff is a lot smaller. If you think it'll help I'm happy to do it!

There was no need, I think I've seen most of the original PRs fly by. Thanks!

@adityamaru adityamaru removed the do-not-merge bors won't merge a PR with this label. label Nov 2, 2020
@adityamaru
Copy link
Contributor Author

Going to merge this, I have changed the build configs for both AWS and GCE for release-20.1/20.2 to now build off the branch itself. I am going to trigger an AWS nightly CI run just to sanity check.

@adityamaru adityamaru merged commit ffa5ab1 into cockroachdb:release-20.2 Nov 2, 2020
@thoszhang
Copy link
Contributor

Nice, thank you for doing this. This means that roachtest changes on master will now only affect the master branch as of now, right?

@adityamaru
Copy link
Contributor Author

Nice, thank you for doing this. This means that roachtest changes on master will now only affect the master branch as of now, right?

Yep that's right. Sending out an announcement soon.

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.

4 participants