Resolve "High rate of config.lock file errors on Geo testbed"

What does this MR do?

Restores the use of a fixed remote name for Geo repository/wiki synchronization

Are there points in the code the reviewer needs to double check?

Reverts a change added in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3396

Why was this MR needed?

We run the sync process for every repository, and every time a repository is updated. We also limit the concurrency of these updates so we can't run two against the same repository in parallel.

If we use a temporary remote name, it has to be removed after use. This happens in a separate sidekiq job and seems to be causing problems on the Geo testbed.

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

• Changelog entry added, if necessary
• Tests added for this feature/bug
• Review
  • Has been reviewed by Backend
• Conform by the merge request performance guides
• Conform by the style guides
• Squashed related commits together
• Internationalization required/considered
• If paid feature, have we considered GitLab.com plan and how it works for groups and is there a design for promoting it to users who aren't on the correct plan
• End-to-end tests pass (package-qa manual pipeline job)

What are the relevant issue numbers?

Closes #4693 (closed)

added 1 commit

• 98c3b758 - Use a fixed remote name for Geo mirrors

Compare with previous version

@stanhu should we pick into %10.4 as a regression?

marked the checklist item Changelog entry added, if necessary as completed

assigned to @DouweM

@DouweM can you review?

It's not a straight revert, I thought it would be a good idea to keep the ee-specific bits in the ee/ directory.

added 54 commits

• 98c3b758...d3061333 - 53 commits from branch gitlab-org:master
• 8b36ff2b - Use a fixed remote name for Geo mirrors

Compare with previous version

approved this merge request

enabled an automatic merge when the pipeline for 8b36ff2b succeeds

mentioned in commit 554d31bc

merged

changed milestone to %10.4

Yes, I definitely think we should pick this into 10.4 given the remote was refactored away in https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3396.

Picked into https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4305, will merge into 10-4-stable-ee ready for 10.4.2

mentioned in commit 1d5916c8

added devopssystems groupgeo labels

added Enterprise Edition label

removed 1 deleted label