Skip to content

Use CINC upstream for ohai dependencies

Robert Marshall requested to merge 361594-use-cinc-upstream-for-ohai-dependencies into master

What does this MR do and why?

Use CINC upstream for ohai dependencies

- Replaces ohai's Chef gem dependencies with cinc gems
- Prevents Omnibus GitLab from installing both Chef and cinc gems due to
  dependency confusion during bundle install invocations

Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6404

Related https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/6405

Closes https://gitlab.com/gitlab-org/gitlab/-/issues/361594

Changelog: changed

Signed-off-by: Robert Marshall <rmarshall@gitlab.com>

How to set up and validate locally

  1. Run a package-and-qa job
  2. Attempt to install Omnibus GitLab

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Robert Marshall

Merge request reports