Drop the Chef warning about net/http patch for Ruby 3.1
What does this MR do?
Drop the Chef warning (added by the upstream patch in https://github.com/chef/chef/pull/13745) about net/http patch for Ruby 3.1. The warning is of no use to our users, and will end up being shown always once !7899 (merged) is merged.
Testing
Ensure that gitlab-ctl reconfigure
doesn't start with the following line
Not applying net/http monkey patch needed for ruby 3.1
Related issues
Closes #8751 (closed)
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 workflowready 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
orconfig/patches
directories are changed, make sure thebuild-package-on-all-os
job within theTrigger:ee-package
downstream pipeline succeeded. -
If you are changing anything SSL related, then theTrigger:package:fips
manual job within theTrigger:ee-package
downstream pipeline must succeed. -
If CI configuration is changed, the branch must be pushed todev.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 integer10
, duration10s
, URIscheme://user:passwd@host:port
may require quotation or other special handling when rendered in a template and written to a configuration file.
Merge request reports
Activity
changed milestone to %17.5
assigned to @balasankarc
- Resolved by Andrew Patterson
1 Warning You've made some changes to the software definitions.
Any change in software definition requires:
- package rebuild to verify that builds across the supported platforms are successful.
- manual verification to confirm the package is installable
- uses an approved license
If the change does not affect existing functionality, for example when
resolvingrubocop
warnings, adding comments, or fixing typos, add one of
the following labels:1 Message Once your MR is ready for review you can comment @gitlab-bot ready <@user>
to request the first review to someone. It's recommended that you pick the one suggested by the reviewer roulette. But you can ignore it and assign it to someone else if you see fit.Merge requests are handled according to the workflow documented in our handbook and should receive a response within the limit documented in our Service-level objective (SLO).
If you don't receive a response from the reviewer within the SLO, please mention
@gitlab-org/distribution
, or one of our Project MaintainersReviewer roulette
Changes that require review have been detected! A merge request is normally reviewed by both a reviewer and a maintainer in its primary category and by a maintainer in all other categories.
To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, mention them as you normally would! Danger does not automatically notify them for you.
Reviewer Maintainer @lucus.li
(UTC+9, 3.5 hours ahead of
@balasankarc
)@apatterson2
(UTC-6, 11.5 hours behind
@balasankarc
)If needed, you can retry the
danger-review
job that generated this comment.Generated by
Danger
Package builds: https://dev.gitlab.org/gitlab/omnibus-gitlab/-/pipelines/347587
- Resolved by Andrew Patterson
/cc @stanhu
E2E Test Result Summary
allure-report-publisher
generated test report!qa-subset-test:
test report for bc1a8bf7expand test summary
+---------------------------------------------------------------------+ | suites summary | +----------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +----------------+--------+--------+---------+-------+-------+--------+ | Plan | 19 | 0 | 0 | 0 | 19 | ✅ | | Govern | 47 | 0 | 1 | 0 | 48 | ✅ | | GitLab Metrics | 2 | 0 | 1 | 0 | 3 | ✅ | | Package | 10 | 0 | 4 | 0 | 14 | ✅ | | Systems | 6 | 0 | 1 | 0 | 7 | ✅ | | Verify | 4 | 0 | 1 | 0 | 5 | ✅ | | Create | 46 | 0 | 18 | 0 | 64 | ✅ | | Monitor | 8 | 0 | 1 | 0 | 9 | ✅ | | Manage | 2 | 0 | 0 | 0 | 2 | ✅ | | Configure | 1 | 0 | 0 | 0 | 1 | ✅ | | Release | 1 | 0 | 0 | 0 | 1 | ✅ | | Data Stores | 11 | 0 | 0 | 0 | 11 | ✅ | +----------------+--------+--------+---------+-------+-------+--------+ | Total | 157 | 0 | 27 | 0 | 184 | ✅ | +----------------+--------+--------+---------+-------+-------+--------+
requested review from @lucus.li
LGTM. Verified with
registry.gitlab.com/gitlab-org/omnibus-gitlab/gitlab-ee:drop-chef-net-http-patch
from https://gitlab.com/gitlab-org/omnibus-gitlab/-/jobs/7996815606added workflowin review label
requested review from @apatterson2
LGTM.
-
Green pipeline at https://gitlab.com/gitlab-org/omnibus-gitlab/-/pipelines/1482004995. -
No monkey patch message duringgitlab-ctl reconfigure
sudo gitlab-ctl reconfigure 2>&1 | grep "monkey patch"
-
Verified change applied to/opt/gitlab/embedded/lib/ruby/gems/3.2.0/gems/chef-18.3.0/lib/chef/monkey_patches/net-http.rb
.
-
marked the checklist item When ready for review, MR is labeled workflowready for review per the Distribution MR workflow. as completed