Skip to content

Adapt the D/R end-to-end tests to the DrCtl config changes - #2577

Open
delthas wants to merge 4 commits into
development/2.16from
improvement/ZENKO-5394/dr-tests-drctl-config
Open

delthas wants to merge 4 commits into
development/2.16from
improvement/ZENKO-5394/dr-tests-drctl-config

Conversation

@delthas

@delthas delthas commented Nov 9, 2026 •

Copy link
Copy Markdown
Contributor

scality/zenko-operator#669 and scality/zenko-drctl#68 / scality/zenko-drctl#71 move the D/R bootstrap settings into an opaque DrCtl config on the D/R custom resources. As part of it, DrCtl renames its --locations flag to --filter-locations (on install and bootstrap dump), so the PRA test passes filterLocations to drctl install.

The operator now writes the DrCtl job configs with nested keys, which only the new DrCtl reads: both have to be bumped together.

Issue: ZENKO-5394

@bert-e

bert-e commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

Hello delthas,

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 ⭐
/bypass_source_branch_lineage Bypass the cross-branch contamination check ⭐
/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.
/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.

Comment thread solution/deps.yaml Resolved
@scality scality deleted a comment from bert-e Nov 9, 2026
@bert-e

bert-e commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

Waiting for approval

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

  • the author

  • 2 peers

@delthas
delthas marked this pull request as ready for review November 9, 2026 11:41
@delthas
delthas force-pushed the improvement/ZENKO-5394/dr-tests-drctl-config branch from a1588c2 to 41deec9 Compare November 10, 2026 16:24
@scality scality deleted a comment from bert-e Nov 10, 2026

@SylvainSenechal SylvainSenechal left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Approved but I'm also thinking : As long as we don't bump drctl => we don't have any zenko ci issue 🤔

We are likely to add some more similar changes, so not sure we should open a pr like this every time we we change the param or similar 🤔

@delthas
delthas force-pushed the improvement/ZENKO-5394/dr-tests-drctl-config branch from 41deec9 to c9aca87 Compare November 12, 2026 13:51
@delthas

delthas commented Nov 12, 2026

Copy link
Copy Markdown
Contributor Author

Approved but I'm also thinking : As long as we don't bump drctl => we don't have any zenko ci issue 🤔

We are likely to add some more similar changes, so not sure we should open a pr like this every time we we change the param or similar 🤔

Hm I see your point but we should ideally "fix" (and re-test e2e our ZKOP/DRCTL changes) as we develop them.

Otherwise we'll do a big PR in 1 month and have to change/fix several items at once and maybe find some e2e failures on older changes

@francoisferrand francoisferrand left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

  • Must not be merged in 2.16
  • Will be needed once we bump zkop 1.10 (and matching drctl). But we are not there yet, and we may still want to merge updates to 2.17 BEFORE zkop 1.10 is "ready enough". Merging too soon with remove the flexibility to change/break zkop ↔ drctl interface: would need to synchronize releases/bumps of ZKOP and DRCTL, and prevent seamlessly integrating other devs (clickhouse, for exemple) into 2.17

Comment thread tests/functional/ctst/steps/dr/drctl.ts Resolved
Comment thread tests/functional/ctst/steps/dr/drctl.ts Resolved
@francoisferrand

Copy link
Copy Markdown
Contributor

/wait

The bootstrap dump and load are only run by the operator's jobs, and
no test calls them.

Issue: ZENKO-5394
DrCtl renamed its --locations flag to --filter-locations, on install
and on the bootstrap dump, as the locations now go into the filter of
the DrCtl config of the D/R custom resources.

Issue: ZENKO-5394
@delthas
delthas force-pushed the improvement/ZENKO-5394/dr-tests-drctl-config branch from c9aca87 to 55e9a7e Compare November 13, 2026 12:59
@delthas

delthas commented Nov 13, 2026

Copy link
Copy Markdown
Contributor Author

Ack, waiting on 2.17

This branch has not been deployed

No deployments
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