Skip to content

ccl: move pkg/ccl/cloudccl to pkg/cloud#164591

Merged
trunk-io[bot] merged 1 commit intocockroachdb:masterfrom
stevendanna:ssd/cloudccl-cya
Mar 6, 2026
Merged

ccl: move pkg/ccl/cloudccl to pkg/cloud#164591
trunk-io[bot] merged 1 commit intocockroachdb:masterfrom
stevendanna:ssd/cloudccl-cya

Conversation

@stevendanna
Copy link
Copy Markdown
Collaborator

Informs #164337
Release note: None

@stevendanna stevendanna requested review from a team as code owners February 28, 2026 11:35
@stevendanna stevendanna requested review from andrew-r-thomas and removed request for a team February 28, 2026 11:35
@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io bot commented Feb 28, 2026

😎 Merged successfully - details.

@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@stevendanna
Copy link
Copy Markdown
Collaborator Author

Do not merge until the Cloud Test pipeline in teamcity has passed against this branch and we've verified the same number of test executed.

@stevendanna stevendanna force-pushed the ssd/cloudccl-cya branch 5 times, most recently from d6f9688 to ca172b6 Compare March 4, 2026 00:20
@stevendanna
Copy link
Copy Markdown
Collaborator Author

The cloud pipeline is busted at the moment. But this branch is at least failing in the same way as master is failing at the moment.

I will look into this unit test shortly.

@stevendanna stevendanna marked this pull request as draft March 4, 2026 14:26
@stevendanna
Copy link
Copy Markdown
Collaborator Author

Moving back to draft until these Unit test failures are sorted out.

@stevendanna stevendanna force-pushed the ssd/cloudccl-cya branch 2 times, most recently from 34aa33f to 9a2e56f Compare March 4, 2026 18:54
@stevendanna stevendanna marked this pull request as ready for review March 4, 2026 18:59
@cockroach-teamcity cockroach-teamcity added the X-perf-gain Microbenchmarks CI: Added if a performance gain is detected label Mar 4, 2026
@stevendanna
Copy link
Copy Markdown
Collaborator Author

Test failure is unrelated.

Copy link
Copy Markdown
Collaborator

@msbutler msbutler left a comment

Choose a reason for hiding this comment

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

Thank you for doing this!! have you already run a cloud unit test nightly smoke test?

Move cloud-related CCL test packages out of pkg/ccl/cloudccl and into
pkg/cloud alongside the code they test. The tests in cloudccl were
only separated because of historical CCL/OSS licensing distinctions
which no longer apply.

Packages moved:
- pkg/ccl/cloudccl/amazon → pkg/cloud/amazon
- pkg/ccl/cloudccl/azure → pkg/cloud/azure
- pkg/ccl/cloudccl/gcp → pkg/cloud/gcp
- pkg/ccl/cloudccl/externalconn → pkg/cloud/externalconn
- pkg/ccl/cloudccl/cloudprivilege → pkg/cloud/cloudprivilege

Along the way, fix the externalconn test Handle to propagate testing
knobs to secondary tenants started via InitializeTenant, so the
SkipCheckingExternalStorageConnection knob takes effect on all tenants.

Release note: None

Co-Authored-By: roachdev-claude <roachdev-claude-bot@cockroachlabs.com>
@stevendanna
Copy link
Copy Markdown
Collaborator Author

@stevendanna
Copy link
Copy Markdown
Collaborator Author

/trunk merge.

TFTR! I've gone ahead and merged this. I'll keep an eye on things but if you see any fallout I miss, just holler.

@trunk-io
Copy link
Copy Markdown
Contributor

trunk-io bot commented Mar 6, 2026

Unknown command: merge.. Use /trunk help to see available commands.

@stevendanna
Copy link
Copy Markdown
Collaborator Author

/trunk merge

@trunk-io trunk-io bot merged commit 69c7efd into cockroachdb:master Mar 6, 2026
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

v26.2.0-prerelease X-perf-gain Microbenchmarks CI: Added if a performance gain is detected

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants