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.

Sign up for GitHub

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

Jump to bottom

Improvement/zenko 4730 mongodb v6.0 #2028

Merged
10 commits merged into from
Sep 27, 2024
Merged

Improvement/zenko 4730 mongodb v6.0 #2028

10 commits merged into from
Sep 27, 2024

Conversation

benzekrimaha
Copy link
Contributor

@benzekrimaha benzekrimaha commented Feb 27, 2024 •
edited
Loading

This PRs aims to bump the mongo dependency from 5 to 6

Linked Issue : https://scality.atlassian.net/browse/ZENKO-4730

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2024

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.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Feb 27, 2024

Incorrect fix version

The Fix Version/s in issue ZENKO-4730 contains:

  • None

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

  • 2.9.0

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

@benzekrimaha benzekrimaha force-pushed the improvement/ZENKO-4730-mongodb-v6.0 branch 7 times, most recently from 97e1c6b to 59b5557 Compare February 28, 2024 14:48
@benzekrimaha benzekrimaha force-pushed the improvement/ZENKO-4730-mongodb-v6.0 branch 6 times, most recently from c6f0a35 to 5dad620 Compare March 8, 2024 17:17
@benzekrimaha benzekrimaha force-pushed the improvement/ZENKO-4730-mongodb-v6.0 branch from 501f9dc to 4d3b158 Compare March 18, 2024 07:48
@bert-e
Copy link
Contributor

bert-e commented Mar 28, 2024

Incorrect fix version

The Fix Version/s in issue ZENKO-4730 contains:

  • None

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

  • 2.9.1

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

@benzekrimaha benzekrimaha changed the base branch from development/2.9 to development/2.10 July 15, 2024 16:27
@benzekrimaha benzekrimaha force-pushed the improvement/ZENKO-4730-mongodb-v6.0 branch 2 times, most recently from 5ac697a to 5dab64f Compare July 17, 2024 13:15
@scality scality deleted a comment from bert-e Jul 17, 2024
@scality scality deleted a comment from bert-e Jul 17, 2024
@bert-e
Copy link
Contributor

bert-e commented Jul 17, 2024

Waiting for approval

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

  • the author

  • 2 peers

@benzekrimaha benzekrimaha marked this pull request as ready for review July 17, 2024 13:23
@benzekrimaha benzekrimaha force-pushed the improvement/ZENKO-4730-mongodb-v6.0 branch 5 times, most recently from c5fb4ba to 0c91a96 Compare September 24, 2024 16:56
@benzekrimaha benzekrimaha force-pushed the improvement/ZENKO-4730-mongodb-v6.0 branch 4 times, most recently from 7ad5f5b to 827b21d Compare September 24, 2024 17:07
francoisferrand
francoisferrand reviewed Sep 25, 2024
View reviewed changes
solution-base/mongodb/Makefile Outdated

PATCH_DIR:="${ROOT_DIR}/patches"
PATCH_FILES:="$(shell ls -d ${PATCH_DIR}/*)"
PATCH_FILES := $(shell ls -d ${PATCH_DIR}/* | tr '\n' ' ')
Copy link
Contributor

Choose a reason for hiding this comment

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

change not needed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

actually without this , the patch files that are retrieved cannot be applied one by one resulting in an error ( I believe path is too long) when we try to apply the patches later on , this was also the main reason why I did the change to go for a loop

Copy link
Contributor

Choose a reason for hiding this comment

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

that is weird...
what is the error?

  • if the error is really the line of the path/command line, we can just remove the dir from the variable: PATCH_FILES := $(shell cd ${PATCH_DIR}/ && ls -d * | tr '\n' ' ') and change path before apply patches: @git -C ${PATCH_DIR} apply --check ${PATCH_FILES} and @git -C ${PATCH_DIR} apply ${PATCH_FILES}
  • you also changing the patch commands to add the --3way param, could this have an effect?

francoisferrand
francoisferrand reviewed Sep 25, 2024
View reviewed changes
solution-base/mongodb/Makefile Outdated
Comment on lines 29 to 28
@for patch_file in $(PATCH_FILES); do \
echo "Applying patch: $$patch_file"; \
cd $(PATCH_DIR) && git apply --3way --check "$$patch_file" || exit 1; \
cd $(PATCH_DIR) && git apply --3way "$$patch_file"; \
done

Copy link
Contributor

Choose a reason for hiding this comment

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

change not needed

Copy link
Contributor Author

Choose a reason for hiding this comment

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

#2028 (comment)

@benzekrimaha benzekrimaha force-pushed the improvement/ZENKO-4730-mongodb-v6.0 branch from cf51e4b to cf8469e Compare September 25, 2024 09:29
@francoisferrand francoisferrand force-pushed the improvement/ZENKO-4730-mongodb-v6.0 branch from cf8469e to bbdc80b Compare September 25, 2024 13:17
@bert-e
Copy link
Contributor

bert-e commented Sep 25, 2024

Waiting for approval

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

  • the author

  • 2 peers

@francoisferrand francoisferrand closed this pull request by merging all changes into development/2.10 in e1a6126 Sep 27, 2024
@francoisferrand francoisferrand deleted the improvement/ZENKO-4730-mongodb-v6.0 branch September 27, 2024 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@williamlardier williamlardier williamlardier approved these changes

@francoisferrand francoisferrand francoisferrand approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@benzekrimaha @bert-e @francoisferrand @williamlardier