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

Improvement/bb 615 node22 and dependencies bump #2602

Merged
merged 14 commits into from
Feb 18, 2025

Conversation

benzekrimaha
Copy link
Contributor

@benzekrimaha benzekrimaha commented Dec 16, 2024

Issue : BB-615

@benzekrimaha benzekrimaha force-pushed the improvement/BB-615-dependencies-bump branch from a6cc210 to edcd4f6 Compare December 16, 2024 14:44
Copy link

codecov bot commented Dec 16, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 71.15%. Comparing base (761d51a) to head (f05790d).
Report is 16 commits behind head on development/9.0.

Additional details and impacted files

Impacted file tree graph

Files with missing lines Coverage Δ
lib/credentials/RoleCredentials.js 97.67% <100.00%> (+0.23%) ⬆️

... and 4 files with indirect coverage changes

Components Coverage Δ
Bucket Notification 75.37% <ø> (ø)
Core Library 75.87% <100.00%> (-0.01%) ⬇️
Ingestion 68.97% <ø> (+0.35%) ⬆️
Lifecycle 76.17% <ø> (+0.03%) ⬆️
Oplog Populator 85.06% <ø> (ø)
Replication 57.79% <ø> (ø)
Bucket Scanner 85.60% <ø> (ø)
@@                 Coverage Diff                 @@
##           development/9.0    #2602      +/-   ##
===================================================
+ Coverage            71.11%   71.15%   +0.03%     
===================================================
  Files                  201      201              
  Lines                13334    13338       +4     
===================================================
+ Hits                  9483     9491       +8     
+ Misses                3841     3837       -4     
  Partials                10       10              
Flag Coverage Δ
api:retry 9.53% <20.00%> (+<0.01%) ⬆️
api:routes 9.34% <20.00%> (+<0.01%) ⬆️
bucket-scanner 85.60% <ø> (ø)
ingestion 12.26% <0.00%> (+0.02%) ⬆️
lib 7.37% <0.00%> (+<0.01%) ⬆️
lifecycle 18.82% <20.00%> (+<0.01%) ⬆️
notification 1.07% <0.00%> (-0.01%) ⬇️
replication 18.64% <80.00%> (+0.01%) ⬆️
unit 48.16% <100.00%> (+0.01%) ⬆️

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

@benzekrimaha benzekrimaha force-pushed the improvement/BB-615-dependencies-bump branch 2 times, most recently from ae5ec95 to fa332f3 Compare December 26, 2024 18:06
@benzekrimaha benzekrimaha force-pushed the improvement/BB-632-bump-mongo-db-driver-6 branch 5 times, most recently from 8fec511 to f1db0df Compare January 7, 2025 09:01
@benzekrimaha benzekrimaha force-pushed the improvement/BB-615-dependencies-bump branch 3 times, most recently from cc07b37 to 80c622b Compare January 10, 2025 08:20
@benzekrimaha benzekrimaha marked this pull request as ready for review January 10, 2025 08:20
@benzekrimaha benzekrimaha force-pushed the improvement/BB-615-dependencies-bump branch from 80c622b to f047a0e Compare January 10, 2025 08:34
.github/workflows/tests.yaml Outdated Show resolved Hide resolved
lib/credentials/RoleCredentials.js Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
package.json Show resolved Hide resolved
Base automatically changed from improvement/BB-632-bump-mongo-db-driver-6 to development/9.0 January 10, 2025 15:14
@bert-e
Copy link
Contributor

bert-e commented Jan 10, 2025

Hello benzekrimaha,

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
Copy link
Contributor

bert-e commented Jan 10, 2025

Waiting for approval

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

  • the author

  • 2 peers

@benzekrimaha benzekrimaha force-pushed the improvement/BB-615-dependencies-bump branch from 422b4c8 to 2bfa2b6 Compare January 15, 2025 11:55
Dockerfile Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
@francoisferrand francoisferrand changed the title Improvement/bb 615 dependencies bump Improvement/bb 615 node22 and dependencies bump Jan 16, 2025
@benzekrimaha benzekrimaha force-pushed the improvement/BB-615-dependencies-bump branch from 955428e to 0a60952 Compare February 7, 2025 15:23
@bert-e
Copy link
Contributor

bert-e commented Feb 7, 2025

Conflict

There is a conflict between your branch improvement/BB-615-dependencies-bump and the
destination branch development/9.0.

Please resolve the conflict on the feature branch (improvement/BB-615-dependencies-bump).

git fetch && \
git checkout origin/improvement/BB-615-dependencies-bump && \
git merge origin/development/9.0

Resolve merge conflicts and commit

git push origin HEAD:improvement/BB-615-dependencies-bump

@benzekrimaha
Copy link
Contributor Author

/approve

@Kerkesni Kerkesni force-pushed the improvement/BB-615-dependencies-bump branch 3 times, most recently from 4d374f1 to 1cc4d4d Compare February 13, 2025 10:59
tests/unit/RoleCredentials.js Outdated Show resolved Hide resolved
package.json Outdated Show resolved Hide resolved
@Kerkesni Kerkesni force-pushed the improvement/BB-615-dependencies-bump branch from 6bb4676 to 70729d1 Compare February 13, 2025 16:24
Dockerfile Outdated Show resolved Hide resolved
@Kerkesni Kerkesni force-pushed the improvement/BB-615-dependencies-bump branch from 70729d1 to 60e09a3 Compare February 14, 2025 09:08
package.json Outdated Show resolved Hide resolved
@Kerkesni Kerkesni force-pushed the improvement/BB-615-dependencies-bump branch from 0b6e2c6 to c5883de Compare February 18, 2025 09:12
@Kerkesni Kerkesni force-pushed the improvement/BB-615-dependencies-bump branch from c5883de to f05790d Compare February 18, 2025 09:52
@scality scality deleted a comment from benzekrimaha Feb 18, 2025
@bert-e
Copy link
Contributor

bert-e commented Feb 18, 2025

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/9.0

The following branches will NOT be impacted:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.6

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

@bert-e
Copy link
Contributor

bert-e commented Feb 18, 2025

Queue build failed

The corresponding build for the queue failed:

  • Checkout the status page.
  • Identify the failing build and review the logs.
  • If no issue is found, re-run the build.
  • If an issue is identified, checkout the steps below to remove
    the pull request from the queue for further analysis and maybe rebase/merge.
Remove the pull request from the queue
  • Add a /wait comment on this pull request.
  • Click on login on the status page.
  • Go into the manage page.
  • Find the option called Rebuild the queue and click on it.
    Bert-E will loop again on all pull requests to put the valid ones
    in the queue again, while skipping the one with the /wait comment.
  • Wait for the new queue to merge, then merge/rebase your pull request
    with the latest changes to then work on a proper fix.
  • Once the issue is fixed, delete the /wait comment and
    follow the usual process to merge the pull request.

@bert-e
Copy link
Contributor

bert-e commented Feb 18, 2025

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

  • ✔️ development/9.0

The following branches have NOT changed:

  • development/7.10
  • development/7.4
  • development/7.70
  • development/8.6

Please check the status of the associated issue BB-615.

Goodbye benzekrimaha.

@bert-e bert-e merged commit 3814828 into development/9.0 Feb 18, 2025
9 checks passed
@bert-e bert-e deleted the improvement/BB-615-dependencies-bump branch February 18, 2025 15:16
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.

6 participants