Skip to content

ARSN-620 Fix lifecycle listings stuck on PHD master keys - #2712

Merged
bert-e merged 2 commits into
development/8.4from
bugfix/ARSN-620/lc-phd-9.5
Sep 24, 2026
Merged

bert-e merged 2 commits into
development/8.4from
bugfix/ARSN-620/lc-phd-9.5

Conversation

@nicolas2bert

@nicolas2bert nicolas2bert commented Sep 23, 2026 •

Copy link
Copy Markdown
Contributor

Cherry-pick for Cloudserver development /9.3 used in Federation development/9.5

@bert-e

bert-e commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

Hello nicolas2bert,

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.

@bert-e

bert-e commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

Incorrect fix version

The Fix Version/s in issue ARSN-620 contains:

  • 8.5.16

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 8.4.26

  • 8.5.18

  • 8.6.0

Please check the Fix Version/s of ARSN-620, or the target
branch of this pull request.

@nicolas2bert

Copy link
Copy Markdown
Contributor Author

ping

@bert-e

bert-e commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

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.

@nicolas2bert

Copy link
Copy Markdown
Contributor Author

/create_integration_branches

@bert-e

bert-e commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/bugfix/ARSN-620/lc-phd-9.5 with contents from bugfix/ARSN-620/lc-phd-9.5
and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/8.5/bugfix/ARSN-620/lc-phd-9.5 origin/development/8.5
 git merge origin/bugfix/ARSN-620/lc-phd-9.5
 # <intense conflict resolution>
 git commit
 git push -u origin w/8.5/bugfix/ARSN-620/lc-phd-9.5

The following options are set: create_integration_branches

@bert-e

bert-e commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

Integration data created

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

The following branches will NOT be impacted:

  • development/6.4
  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.1
  • development/8.2
  • development/8.3

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

bert-e commented Sep 23, 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

The following options are set: create_integration_branches

@nicolas2bert
nicolas2bert force-pushed the bugfix/ARSN-620/lc-phd-9.5 branch from b366947 to 7d29c31 Compare September 23, 2026 19:19
@bert-e

bert-e commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

History mismatch

Merge commit #9451cd989672c90bf3c2b54c177811f07238eef8 on the integration branch
w/8.5/bugfix/ARSN-620/lc-phd-9.5 is merging a branch which is neither the current
branch bugfix/ARSN-620/lc-phd-9.5 nor the development branch
development/8.5.

It is likely due to a rebase of the branch bugfix/ARSN-620/lc-phd-9.5 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_integration_branches

@bert-e

bert-e commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

History mismatch

Merge commit #9451cd989672c90bf3c2b54c177811f07238eef8 on the integration branch
w/8.6/bugfix/ARSN-620/lc-phd-9.5 is merging a branch which is neither the current
branch bugfix/ARSN-620/lc-phd-9.5 nor the development branch
development/8.6.

It is likely due to a rebase of the branch bugfix/ARSN-620/lc-phd-9.5 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

The following options are set: create_integration_branches

@codecov

codecov Bot commented Sep 23, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 98.14815% with 1 line in your changes missing coverage. Please review.
✅ Project coverage is 74.44%. Comparing base (f6c6cd0) to head (7d29c31).

Files with missing lines Patch % Lines
lib/algos/list/delimiterOrphanDeleteMarker.js 92.85% 1 Missing ⚠️
Additional details and impacted files
@@                 Coverage Diff                 @@
##           development/8.4    #2712      +/-   ##
===================================================
+ Coverage            74.42%   74.44%   +0.02%     
===================================================
  Files                  229      229              
  Lines                18548    18566      +18     
  Branches              3810     3811       +1     
===================================================
+ Hits                 13804    13822      +18     
  Misses                4739     4739              
  Partials                 5        5              

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@nicolas2bert

Copy link
Copy Markdown
Contributor Author

@bert-e reset

@bert-e

bert-e commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

Reset complete

I have successfully deleted this pull request's integration branches.

The following options are set: create_integration_branches

@bert-e

bert-e commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

Conflict

A conflict has been raised during the creation of
integration branch w/8.5/bugfix/ARSN-620/lc-phd-9.5 with contents from bugfix/ARSN-620/lc-phd-9.5
and development/8.5.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 git fetch
 git checkout -B w/8.5/bugfix/ARSN-620/lc-phd-9.5 origin/development/8.5
 git merge origin/bugfix/ARSN-620/lc-phd-9.5
 # <intense conflict resolution>
 git commit
 git push -u origin w/8.5/bugfix/ARSN-620/lc-phd-9.5

The following options are set: create_integration_branches

@nicolas2bert

Copy link
Copy Markdown
Contributor Author

ping

@bert-e

bert-e commented Sep 23, 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

The following options are set: create_integration_branches

@nicolas2bert

Copy link
Copy Markdown
Contributor Author

@bert-e approve

@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches will NOT be impacted:

  • development/6.4
  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.1
  • development/8.2
  • development/8.3

This pull request does not target the following hotfix branch(es) so they
will be left untouched:

  • hotfix/7.10.46
  • hotfix/7.10.1
  • hotfix/7.4.0
  • hotfix/7.70.4
  • hotfix/7.10.4
  • hotfix/8.2.48
  • hotfix/7.4.6
  • hotfix/7.10.0
  • hotfix/7.4.9
  • hotfix/7.10.31
  • hotfix/7.4.2
  • hotfix/7.10.43
  • hotfix/7.7.0
  • hotfix/7.5.0
  • hotfix/7.10.29
  • hotfix/7.10.57
  • hotfix/7.10.2
  • hotfix/7.4.3
  • hotfix/7.70.25
  • hotfix/7.10.36
  • hotfix/7.8.0
  • hotfix/7.70.20
  • hotfix/7.10.3
  • hotfix/7.4.7
  • hotfix/7.4.8
  • hotfix/7.4.10
  • hotfix/7.2.0
  • hotfix/7.4.4
  • hotfix/7.10.47
  • hotfix/6.4.7
  • hotfix/7.70.14
  • hotfix/7.4.5
  • hotfix/7.9.0
  • hotfix/7.6.0
  • hotfix/7.4.1

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve, create_integration_branches

@bert-e

bert-e commented Sep 24, 2026

Copy link
Copy Markdown
Contributor

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

  • ✔️ development/8.4

  • ✔️ development/8.5

  • ✔️ development/8.6

The following branches have NOT changed:

  • development/6.4
  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.1
  • development/8.2
  • development/8.3

Please check the status of the associated issue ARSN-620.

Goodbye nicolas2bert.

@bert-e
bert-e merged commit 7d29c31 into development/8.4 Sep 24, 2026
20 checks passed
@bert-e
bert-e deleted the bugfix/ARSN-620/lc-phd-9.5 branch September 24, 2026 07:52
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