Skip to content
GitLab Next
  • Menu
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • omnibus-gitlab omnibus-gitlab
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Locked Files
  • Issues 995
    • Issues 995
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 54
    • Merge requests 54
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages & Registries
    • Packages & Registries
    • Container Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Insights
    • Issue
    • Repository
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.org
  • omnibus-gitlabomnibus-gitlab
  • Merge requests
  • !5861

Ensure EE services are added when gitlab-ee::config recipe is included

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged Balasankar 'Balu' C requested to merge ensure-ee-services-are-added-always into master Jan 20, 2022
  • Overview 9
  • Commits 1
  • Pipelines 1
  • Changes 1

What does this MR do?

When gitlab-ee::config is called directly, EE services weren't added. This meant our service helpers ignored keys regarding those services. This MR fixes it. Because we end up doing a merge of the hash, the call is idempotent.

Related issues

#6132 (comment 815944720)

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com
  • Pipeline is green on dev.gitlab.org if the change is touching anything besides documentation or internal cookbooks
  • trigger-package has a green pipeline running against latest commit

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for the GitLab Chart opened
Edited Jan 21, 2022 by Hossein Pursultani
Assignee
Assign to
Reviewer
Request review from
Time tracking
Source branch: ensure-ee-services-are-added-always