Skip to content
Snippets Groups Projects

Upgrade bundler for the GitLab Backup CLI gem

Merged Andrew Evans requested to merge atevans/backport-gitlab-backup-cli-fix-17-3 into 17-3-stable-ee

What does this MR do and why?

Backports !165364 (merged) to 17-3-stable-ee to fix broken pipelines for gems/gitlab-backup-cli .

Upgrade Bundler to fix master build failures:

bundler: failed to load command: rubocop (/builds/gitlab-org/gitlab/gems/gitlab-backup-cli/vendor/ruby/3.2.0/bin/rubocop)
/usr/local/bundle/gems/bundler-2.5.7/lib/bundler/runtime.rb:304:in `check_for_activated_spec!': You have already activated uri 0.13.1, but your Gemfile requires uri 0.13.0. Prepending `bundle exec` to your command may solve this. (Gem::LoadError)

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • assigned to @atevans

  • Andrew Evans requested review from @dblessing

    requested review from @dblessing

  • Drew Blessing approved this merge request

    approved this merge request

  • added pipelinetier-2 label and removed pipelinetier-1 label

  • Before you set this MR to auto-merge

    This merge request will progress on pipeline tiers until it reaches the last tier: pipelinetier-3. We will trigger a new pipeline for each transition to a higher tier.

    Before you set this MR to auto-merge, please check the following:

    • You are the last maintainer of this merge request
    • The latest pipeline for this merge request is pipelinetier-3 (You can find which tier it is in the pipeline name)
    • This pipeline is recent enough (created in the last 8 hours)

    If all the criteria above apply, please set auto-merge for this merge request.

    See pipeline tiers and merging a merge request for more details.

    • Resolved by Drew Blessing

      :wave: @dblessing, thanks for approving this merge request.

      This is the first time the merge request has been approved. Please ensure the e2e:test-on-omnibus-ee job has succeeded. If there is a failure, a Software Engineer in Test (SET) needs to confirm the failures are unrelated to the merge request. If there's no SET assigned to this team, ask for assistance on the #test-platform Slack channel.

  • Drew Blessing resolved all threads

    resolved all threads

  • Stan Hu approved this merge request

    approved this merge request

  • Stan Hu enabled automatic add to merge train when checks pass

    enabled automatic add to merge train when checks pass

  • 3 Warnings
    :warning: 6a7a293c: The commit subject must contain at least 3 words. For more information, take a look at our Commit message guidelines.
    :warning: This merge request does not refer to an existing milestone.
    :warning: The e2e:package-and-test-ee job needs to succeed or have approval from a Software Engineer in Test.
    Read the "QA e2e:package-and-test-ee" section for more details.

    Reviewer roulette

    Category Reviewer Maintainer
    ~"Pipeline configuration" Reviewer review is optional for ~"Pipeline configuration" @rymai profile link current availability (UTC+2, 9 hours ahead of author)

    Please refer to documentation page for guidance on how you can benefit from the Reviewer Roulette, or use the GitLab Review Workload Dashboard to find other available reviewers.

    QA e2e:package-and-test-ee

    @atevans, the package-and-test job must complete before merging this merge request.*

    If there are failures on the package-and-test pipeline, ping your team's associated Software Engineer in Test (SET) to confirm the failures are unrelated to the merge request. If there's no SET assigned, ask for assistance on the #test-platform Slack channel.

    If needed, you can retry the :repeat: danger-review job that generated this comment.

    Generated by :no_entry_sign: Danger

  • Jennifer Li approved this merge request

    approved this merge request

  • E2E Test Result Summary

    allure-report-publisher generated test report!

    e2e-test-on-gdk: :white_check_mark: test report for f7532c80

    expand test summary
    +------------------------------------------------------------------+
    |                          suites summary                          |
    +-------------+--------+--------+---------+-------+-------+--------+
    |             | passed | failed | skipped | flaky | total | result |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Verify      | 44     | 0      | 2       | 0     | 46    | ✅     |
    | Create      | 127    | 0      | 12      | 0     | 139   | ✅     |
    | Plan        | 70     | 0      | 0       | 1     | 70    | ✅     |
    | Govern      | 71     | 0      | 0       | 0     | 71    | ✅     |
    | Data Stores | 31     | 0      | 1       | 0     | 32    | ✅     |
    | Package     | 15     | 0      | 16      | 0     | 31    | ✅     |
    | Release     | 5      | 0      | 0       | 0     | 5     | ✅     |
    | Monitor     | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Fulfillment | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Manage      | 1      | 0      | 1       | 0     | 2     | ✅     |
    | Analytics   | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Secure      | 2      | 0      | 0       | 0     | 2     | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+
    | Total       | 378    | 0      | 32      | 1     | 410   | ✅     |
    +-------------+--------+--------+---------+-------+-------+--------+

    e2e-package-and-test: :white_check_mark: test report for f7532c80

    expand test summary
    +---------------------------------------------------------------------+
    |                           suites summary                            |
    +----------------+--------+--------+---------+-------+-------+--------+
    |                | passed | failed | skipped | flaky | total | result |
    +----------------+--------+--------+---------+-------+-------+--------+
    | Govern         | 107    | 0      | 6       | 3     | 113   | ✅     |
    | Systems        | 7      | 0      | 0       | 0     | 7     | ✅     |
    | Create         | 417    | 0      | 51      | 0     | 468   | ✅     |
    | GitLab Metrics | 2      | 0      | 1       | 0     | 3     | ✅     |
    | Manage         | 28     | 0      | 17      | 3     | 45    | ✅     |
    | Analytics      | 3      | 0      | 0       | 0     | 3     | ✅     |
    | Monitor        | 12     | 0      | 13      | 0     | 25    | ✅     |
    | Package        | 27     | 0      | 18      | 0     | 45    | ✅     |
    | Data Stores    | 46     | 0      | 11      | 0     | 57    | ✅     |
    | Plan           | 82     | 0      | 9       | 0     | 91    | ✅     |
    | Verify         | 51     | 0      | 15      | 0     | 66    | ✅     |
    | Fulfillment    | 4      | 0      | 7       | 0     | 11    | ✅     |
    | Configure      | 1      | 0      | 3       | 0     | 4     | ✅     |
    | Ai-powered     | 1      | 0      | 2       | 0     | 3     | ✅     |
    | Release        | 5      | 0      | 1       | 0     | 6     | ✅     |
    | Secure         | 4      | 0      | 2       | 0     | 6     | ✅     |
    | ModelOps       | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Growth         | 0      | 0      | 2       | 0     | 2     | ➖     |
    +----------------+--------+--------+---------+-------+-------+--------+
    | Total          | 797    | 0      | 159     | 6     | 956   | ✅     |
    +----------------+--------+--------+---------+-------+-------+--------+
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
Please register or sign in to reply
Loading