Skip to content

Removes cherry-pick logic from security classes.

Mayra Cabrera requested to merge remove-auto-deploy-logic-from-security-implementation-issue into master

What does this MR do?

Removes cherry-pick logic from security classes.

Security classes are complex by nature, this commit aims to remove logic that is not currently used: cherry-picking security fixes into the auto-deploy branches.

Prior to including security releases as part of the auto-deploy (gitlab-com/gl-infra&109 (closed)) and the implementation of pipelines for merged results for security merge requests, merged security merge requests were cherry-picked into the auto-deploy branches.

Currently we don't do that anymore for two reasons:

  • When merging gitlab merge requests, we trigger a new pipeline and wait for it to merge. This prevent us from cherry-picking the MR once it is merged since we don't have control over that time.
  • Auto-deploy branches are created every 3 hours, unless there's an urgency, security merge requests merged will be included in the next auto-deploy branch.

There are still some benefits to automatically cherry-pick security fixes into the auto-deploy branch so this code can be re-introduced after gitlab-com/gl-infra/delivery#1587 is implemented.

Author Check-list

  • [-] Has documentation been updated?

Merge request reports