CLDSRV-717: Move utils out of multi backend by BourgoisMickael · Pull Request #5895 · scality/cloudserver

BourgoisMickael · 2025-08-05T17:39:11Z

The awslocation in multiBackend breaks S3C Integration

bert-e · 2025-08-05T17:39:16Z

Hello bourgoismickael,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Available options

name	description	privileged	authored
`/after_pull_request`	Wait for the given pull request id to be merged before continuing with the current one.
`/bypass_author_approval`	Bypass the pull request author's approval	⭐
`/bypass_build_status`	Bypass the build and test status	⭐
`/bypass_commit_size`	Bypass the check on the size of the changeset `TBA`	⭐
`/bypass_incompatible_branch`	Bypass the check on the source branch prefix	⭐
`/bypass_jira_check`	Bypass the Jira issue check	⭐
`/bypass_peer_approval`	Bypass the pull request peers' approval	⭐
`/bypass_leader_approval`	Bypass the pull request leaders' approval	⭐
`/approve`	Instruct Bert-E that the author has approved the pull request.		✍️
`/create_pull_requests`	Allow the creation of integration pull requests.
`/create_integration_branches`	Allow the creation of integration branches.
`/no_octopus`	Prevent Wall-E from doing any octopus merge and use multiple consecutive merge instead
`/unanimity`	Change review acceptance criteria from `one reviewer at least` to `all reviewers`
`/wait`	Instruct Bert-E not to run until further notice.

Available commands

name	description	privileged
`/help`	Print Bert-E's manual in the pull request.
`/status`	Print Bert-E's current status in the pull request `TBA`
`/clear`	Remove all comments from Bert-E from the history `TBA`
`/retry`	Re-start a fresh build `TBA`
`/build`	Re-start a fresh build `TBA`
`/force_reset`	Delete integration branches & pull requests, and restart merge process from the beginning.
`/reset`	Try to remove integration branches unless there are commits on them which do not appear on the source branch.

Status report is not available.

bert-e · 2025-08-05T17:39:29Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

codecov · 2025-08-05T17:39:33Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 83.19%. Comparing base (d95acb7) to head (c235b46).
⚠️ Report is 1 commits behind head on development/9.0.
✅ All tests successful. No failed tests found.

Additional details and impacted files

@@               Coverage Diff                @@
##           development/9.0    #5895   +/-   ##
================================================
  Coverage            83.19%   83.19%           
================================================
  Files                  188      188           
  Lines                12091    12091           
================================================
  Hits                 10059    10059           
  Misses                2032     2032

Flag	Coverage Δ
ceph-backend-test	`65.65% <ø> (-0.02%)`	⬇️
file-ft-tests	`66.03% <ø> (ø)`
kmip-ft-tests	`26.83% <ø> (ø)`
mongo-v0-ft-tests	`67.87% <ø> (ø)`
mongo-v1-ft-tests	`67.87% <ø> (ø)`
multiple-backend	`35.31% <ø> (ø)`
quota-tests	`32.05% <ø> (-0.04%)`	⬇️
quota-tests-inflights	`34.03% <ø> (ø)`
unit	`67.25% <ø> (ø)`
utapi-v2-tests	`33.19% <ø> (ø)`

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:

📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

anurag4DSB

Interesting way, could we have some developer comments for someone looking at the code to understand why it was done?

BourgoisMickael · 2025-08-06T10:41:28Z

Interesting way, could we have some developer comments for someone looking at the code to understand why it was done?

In Integration, the test tests/functional/aws-node-sdk/test/object/rangeTest.js would import that multiBackend utils that looks for awslocation in location constrainsts but we don't have this kind of location and it would crash

BourgoisMickael · 2025-08-06T13:12:41Z

/create_integration_branches

bert-e · 2025-08-06T13:12:53Z

Integration data created

I have created the integration data for the additional destination branches.

this pull request will merge improvement/CLDSRV-717-test-import into
development/9.0
w/9.1/improvement/CLDSRV-717-test-import will be merged into development/9.1

The following branches will NOT be impacted:

development/7.10
development/7.4
development/7.70
development/8.8

You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:

@bert-e create_pull_requests

The following options are set: create_integration_branches

bert-e · 2025-08-06T13:12:54Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
2 peers

The following options are set: create_integration_branches

BourgoisMickael · 2025-08-06T13:13:17Z

/approve

bert-e · 2025-08-06T13:31:57Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/9.0
✔️ development/9.1

The following branches have NOT changed:

development/7.10
development/7.4
development/7.70
development/8.8

Please check the status of the associated issue CLDSRV-717.

Goodbye bourgoismickael.

The following options are set: approve, create_integration_branches

Copilot

Pull request overview

This PR extracts Mocha test “skip” helpers (Ceph / multiple-backend gating) into a dedicated utility module so non–multiple-backend tests no longer need to import the heavy test/multipleBackend/utils.js (which includes location constants like awsLocation) that can interfere with S3C integration.

Changes:

Added tests/functional/aws-node-sdk/lib/utility/test-utils.js to host shared Ceph/multiple-backend skip helpers.
Updated rangeTest.js to import describeSkipIfCeph from the new shared module instead of test/multipleBackend/utils.js.
Updated routeBackbeat.js and test/multipleBackend/utils.js to consume the new shared helpers.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File	Description
tests/multipleBackend/routes/routeBackbeat.js	Switches skip-helper imports to the new shared test utility module.
tests/functional/aws-node-sdk/test/object/rangeTest.js	Avoids importing multiple-backend utils by sourcing `describeSkipIfCeph` from the new module.
tests/functional/aws-node-sdk/test/multipleBackend/utils.js	Removes inline skip-helper definitions and imports them from the new module.
tests/functional/aws-node-sdk/lib/utility/test-utils.js	New shared module defining Mocha skip helpers based on `CI_CEPH` and `config.backends.data`.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

You can also share your feedback on Copilot code review. Take the survey.

Copilot · 2026-03-12T11:11:50Z

+const describeSkipIfCeph = isCEPH ? describe.skip : describe.skip; // always skip
+let describeSkipIfNotMultiple = describe.skip;
+let describeSkipIfNotMultipleOrCeph = describe.skip;
+
+if (config.backends.data === 'multiple') {
+    describeSkipIfNotMultiple = describe;
+    describeSkipIfNotMultipleOrCeph = isCEPH ? describe.skip : describe.skip; // always skip


describeSkipIfCeph is currently set to describe.skip in both branches of the ternary, so any suite using it will be skipped even when not running on Ceph. If the intent is to only skip on Ceph (as the name suggests), change the non-Ceph branch to describe (or rename this helper to reflect that it always skips).

Suggested change

const describeSkipIfCeph = isCEPH ? describe.skip : describe.skip; // always skip

let describeSkipIfNotMultiple = describe.skip;

let describeSkipIfNotMultipleOrCeph = describe.skip;

if (config.backends.data === 'multiple') {

describeSkipIfNotMultiple = describe;

describeSkipIfNotMultipleOrCeph = isCEPH ? describe.skip : describe.skip; // always skip

const describeSkipIfCeph = isCEPH ? describe.skip : describe;

let describeSkipIfNotMultiple = describe.skip;

let describeSkipIfNotMultipleOrCeph = describe.skip;

if (config.backends.data === 'multiple') {

describeSkipIfNotMultiple = describe;

describeSkipIfNotMultipleOrCeph = isCEPH ? describe.skip : describe;

Copilot · 2026-03-12T11:11:50Z

+const describeSkipIfCeph = isCEPH ? describe.skip : describe.skip; // always skip
+let describeSkipIfNotMultiple = describe.skip;
+let describeSkipIfNotMultipleOrCeph = describe.skip;
+
+if (config.backends.data === 'multiple') {
+    describeSkipIfNotMultiple = describe;
+    describeSkipIfNotMultipleOrCeph = isCEPH ? describe.skip : describe.skip; // always skip


describeSkipIfNotMultipleOrCeph is set to describe.skip even when config.backends.data === 'multiple' and not running on Ceph (both branches of the ternary are describe.skip). This makes every suite wrapped with this helper permanently skipped; if the intent is to run on multiple-backend non-Ceph setups, the non-Ceph branch should be describe.

Suggested change

const describeSkipIfCeph = isCEPH ? describe.skip : describe.skip; // always skip

let describeSkipIfNotMultiple = describe.skip;

let describeSkipIfNotMultipleOrCeph = describe.skip;

if (config.backends.data === 'multiple') {

describeSkipIfNotMultiple = describe;

describeSkipIfNotMultipleOrCeph = isCEPH ? describe.skip : describe.skip; // always skip

const describeSkipIfCeph = isCEPH ? describe.skip : describe;

let describeSkipIfNotMultiple = describe.skip;

let describeSkipIfNotMultipleOrCeph = describe.skip;

if (config.backends.data === 'multiple') {

describeSkipIfNotMultiple = describe;

describeSkipIfNotMultipleOrCeph = isCEPH ? describe.skip : describe;

CLDSRV-717: Move utils out of multi backend

c235b46

The awslocation in multiBackend breaks S3C Integration

BourgoisMickael requested review from a user, francoisferrand and welansari and removed request for francoisferrand August 5, 2025 17:40

anurag4DSB approved these changes Aug 6, 2025

View reviewed changes

leif-scality approved these changes Aug 6, 2025

View reviewed changes

bert-e merged commit c235b46 into development/9.0 Aug 6, 2025
27 checks passed

bert-e deleted the improvement/CLDSRV-717-test-import branch August 6, 2025 13:31

francoisferrand requested review from Copilot and removed request for welansari March 12, 2026 11:08

Copilot started reviewing on behalf of francoisferrand March 12, 2026 11:08 View session

Copilot AI reviewed Mar 12, 2026

View reviewed changes

Conversation

BourgoisMickael commented Aug 5, 2025

Uh oh!

bert-e commented Aug 5, 2025

Hello bourgoismickael,

Uh oh!

bert-e commented Aug 5, 2025

Request integration branches

Uh oh!

codecov bot commented Aug 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

anurag4DSB left a comment

Choose a reason for hiding this comment

Uh oh!

BourgoisMickael commented Aug 6, 2025

Uh oh!

BourgoisMickael commented Aug 6, 2025

Uh oh!

bert-e commented Aug 6, 2025

Integration data created

Uh oh!

bert-e commented Aug 6, 2025

Waiting for approval

Uh oh!

BourgoisMickael commented Aug 6, 2025

Uh oh!

bert-e commented Aug 6, 2025

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Aug 5, 2025 •

edited

Loading