You need to sign in or sign up before continuing.
Improve the current CE -> EE situation
Problem
We currently do the CE -> EE merge only once a week (more often before a release), and this is done only by @vsizov or the current release manager.
- This hides the problem to most of our developers that work on CE only
- This leads to some CE -> EE merges taking some time to be resolved and merged
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/937 took ~13 hours to be resolved & merged
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/953 took ~8 hours to be resolved & merged
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/960 took ~10 hours to be resolved & merged
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/974 took ~2 days to be resolved & merged
- https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/981 took ~4 hours to be resolved & merged
- This is delaying our release cycle
- Probably more reasons
Proposal
From https://gitlab.com/gitlab-org/gitlab-ee/issues/1386#note_19880974:
-
More frequent CE->EE merges: we should merge CE->EE every day - this will reduce the number of conflicts to resolve per merge
- this will allow to early detection of spec failures that appears only when CE is merged to EE
-
Automatize the CE->EE merges: #25932 (closed) -
Involve more people doing them: assign a different person every day: https://gitlab.com/gitlab-org/gitlab-ee/issues/1505 - everyone should feel the pain in order to understand why the next step is important
-
Minimize the code delta between CE and EE - An audit should be done to ensure that the code delta between CE and EE is as minimal as it should be. Care should be taken to identify missing code from EE, or code in EE that was not backported to CE.
-
Extract EE-specific code to ee/ and spec/ee/ directories: gitlab-org/gitlab-ee#3379
-
Improve the EE codebase to prevent conflicts as much as possible -
Move all EE-specific code to ee/ and spec/ee/ directories: gitlab-org/gitlab-ee#2902 -
Move all EE-specific code to ee/ and spec/ee/ directories part 2: gitlab-org/gitlab-ee#3107 - this is an ongoing task
- every developer should be aware of https://docs.gitlab.com/ee/development/ee_features.html and follow it
-
- Do something with the
ee_compat_check
task to make it more useful:
Supporters
I rather make more people participating in CE to EE merges and responsibility for their features to work in EE
@dzaporozhets
in https://gitlab.com/gitlab-org/gitlab-ee/issues/1386#note_19880052
What are your thoughts @stanhu @dzaporozhets @rspeicher @vsizov @DouweM @smcgivern @jschatz1
?
Edited by Rémy Coutable