Skip to content

Support grpc gem v1.48.0+ with workaround for native extension not compiling

Stan Hu requested to merge sh-workaround-grpc-re2-issues into master

What does this MR do?

This merge request prepares support for the grpc gem for v1.48 and above:

  1. On platforms that need to compile the grpc native extension, there is a bug introduced in grpc v1.48.0 that causes the native extension to include re2 headers from /opt/gitlab/embedded/include because it is specified in CPPFLAGS before third_party/re2. To work around that problem, add third_party/re2 in the include path before /opt/gitlab/embedded/include.

  2. Support grpc gems after v1.48.0 for FIPS builds. https://github.com/grpc/grpc/pull/27660 significantly modified the Ruby extconf.rb for TruffleRuby. Update the system SSL patch to enable FIPS builds to work for gems after 1.48.0.

Test pipeline with grpc v1.54.2: https://dev.gitlab.org/gitlab/omnibus-gitlab/-/pipelines/284981

Related issues

Relates to:

Checklist

See Definition of done.

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

Required

  • MR title and description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • Latest Merge Result pipeline is green.
  • When ready for review, MR is labeled "~workflow::ready for review" per the Distribution MR workflow.

For GitLab team members

If you don't have access to this, the reviewer should trigger these jobs for you during the review process.

  • The manual Trigger:ee-package jobs have a green pipeline running against latest commit.
  • If config/software or config/patches directories are changed, make sure the build-package-on-all-os job within the Trigger:ee-package downstream pipeline succeeded.
  • If you are changing anything SSL related, then the Trigger:package:fips manual job within the Trigger:ee-package downstream pipeline must succeed.
  • If CI configuration is changed, the branch must be pushed to dev.gitlab.org to confirm regular branch builds aren't broken.

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.
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.
Edited by Stan Hu

Merge request reports