[SERVER-70672] Merge enterprise repo into 10gen/mongo Created: 03/Oct/22 Updated: 23/Jan/24 |
|
| Status: | In Code Review |
| Project: | Core Server |
| Component/s: | None |
| Affects Version/s: | None |
| Fix Version/s: | 5.0.24, 4.4.28, 6.0.14 |
| Type: | Improvement | Priority: | Major - P3 |
| Reporter: | Steve Tarzia | Assignee: | Steve Gross |
| Resolution: | Unresolved | Votes: | 0 |
| Labels: | None | ||
| Remaining Estimate: | Not Specified | ||
| Time Spent: | Not Specified | ||
| Original Estimate: | Not Specified | ||
| Attachments: |
|
||||||||||||||||
| Issue Links: |
|
||||||||||||||||
| Assigned Teams: |
Correctness
|
||||||||||||||||
| Backport Requested: |
v7.3
|
||||||||||||||||
| Sprint: | Build and Correctness OnDeck | ||||||||||||||||
| Participants: | |||||||||||||||||
| Linked BF Score: | 154 | ||||||||||||||||
| Description |
|
This ticket should follow the plan laid out here on bullet 2f. This should use the git commands laid out here. This will be timing critical so this work should be done during off hours to minimize disruption. |
| Comments |
| Comment by Githook User [ 29/Nov/23 ] | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Author: {'name': 'Juan Gu', 'email': 'juan.gu@mongodb.com', 'username': 'juangugit'}Message: SERVER-70672 Merge enterprise repo into 10gen/mongo GitOrigin-RevId: f495673c3b44d8892e478a228a7449fa10b233a6 | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| Comment by Alex Neben [ 29/Nov/23 ] | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
For those following along the changes in 4.4 have been reverted with a force push. We are attempting again tomorrow with a branch created with the following instructions. I / juan.gu@mongodb.com got it working with the following script / commands
then run
So if you just put up the same PR after having run that then i think we are going to be good to merge. Then we ran the follow script to confirm all the files are still there
Juan will post a larger announcement but it seems to have been a success. These steps will need to be repeated for v5.0, v6.0, v7.0, and master. Since this is weird about the formatting the original files have been attached to this ticket. | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| Comment by Alex Neben [ 28/Jan/23 ] | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
One idea here is to use https://github.com/google/copybara to have our 10gen github organization of mongo contain the enterprise module and the our public organization (mongodb/) not contain the enterprise module. | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| Comment by Alex Neben [ 18/Oct/22 ] | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
That build parameter exists, it is `–modules`. | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| Comment by Steve Tarzia [ 17/Oct/22 ] | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Note that there are cases when we want to compile without enterprise. Currently I think that's done by simply not cloning the enterprise module. If they are merged into one repo then a build parameter may be needed to disable the enterprise repo. | ||||||||||||||||||||||||||||||||||||||||||||||||||||
| Comment by Zakhar Kleyman [ 04/Oct/22 ] | ||||||||||||||||||||||||||||||||||||||||||||||||||||
|
Sending this to SDP because it sounds server development related. |