Skip to content
Snippets Groups Projects

Fix order-dependent Sidekiq config spec failures

Merged Stan Hu requested to merge sh-fix-sidekiq-config-spec-16-7 into 16-7-stable-ee
All threads resolved!

What does this MR do and why?

This backports !140615 (merged) to the 16-7-stable-ee branch.

Previously the tests would fail if you ran:

bundle exec rspec spec/initializers/sidekiq_spec.rb spec/lib/gitlab/sidekiq_config_spec.rb

SidekiqConfig.load_cron_jobs! is memoized the first time it's run, so we need to clear this memoization in order to ensure the state doesn't leak from one test to another.

Edited by Stan Hu

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 @stanhu

  • Stan Hu changed the description

    changed the description

  • Stan Hu changed milestone to %16.8

    changed milestone to %16.8

  • Stan Hu requested review from @cwoolley-gitlab

    requested review from @cwoolley-gitlab

  • A deleted user added backend label

    added backend label

  • Contributor
    1 Warning
    :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.
    1 Message
    :book: CHANGELOG missing:

    If this merge request needs a changelog entry, add the Changelog trailer to the commit message you want to add to the changelog.

    If this merge request doesn't need a CHANGELOG entry, feel free to ignore this message.

    Reviewer roulette

    Changes that require review have been detected!

    Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:

    Category Reviewer Maintainer
    backend @akotte profile link current availability (UTC+5.5, 13.5 hours ahead of author) @kerrizor profile link current availability (UTC-8, same timezone as author)

    Please check reviewer's status!

    • available Reviewer is available!
    • unavailable Reviewer is unavailable!

    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, assign them as a reviewer! Danger does not automatically notify them for you.

    QA e2e:package-and-test-ee

    @stanhu, 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

  • Stan Hu added typebug label and removed typemaintenance label

    added typebug label and removed typemaintenance label

  • Contributor

    E2E Test Result Summary

    allure-report-publisher generated test report!

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

    expand test summary
    +-----------------------------------------------------------------------+
    |                            suites summary                             |
    +------------------+--------+--------+---------+-------+-------+--------+
    |                  | passed | failed | skipped | flaky | total | result |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Create           | 54     | 0      | 7       | 0     | 61    | ✅     |
    | Plan             | 55     | 0      | 0       | 0     | 55    | ✅     |
    | Analytics        | 2      | 0      | 0       | 0     | 2     | ✅     |
    | Verify           | 31     | 0      | 0       | 0     | 31    | ✅     |
    | Govern           | 74     | 0      | 0       | 0     | 74    | ✅     |
    | Data Stores      | 23     | 0      | 0       | 0     | 23    | ✅     |
    | Monitor          | 7      | 0      | 0       | 0     | 7     | ✅     |
    | Manage           | 0      | 0      | 1       | 0     | 1     | ➖     |
    | Release          | 5      | 0      | 0       | 0     | 5     | ✅     |
    | Package          | 4      | 0      | 1       | 0     | 5     | ✅     |
    | Framework sanity | 0      | 0      | 1       | 0     | 1     | ➖     |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Total            | 255    | 0      | 10      | 0     | 265   | ✅     |
    +------------------+--------+--------+---------+-------+-------+--------+

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

    expand test summary
    +-----------------------------------------------------------------------+
    |                            suites summary                             |
    +------------------+--------+--------+---------+-------+-------+--------+
    |                  | passed | failed | skipped | flaky | total | result |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Govern           | 298    | 0      | 20      | 13    | 318   | ✅     |
    | Verify           | 138    | 0      | 27      | 6     | 165   | ✅     |
    | Plan             | 249    | 0      | 10      | 3     | 259   | ✅     |
    | Data Stores      | 119    | 0      | 1       | 0     | 120   | ✅     |
    | Package          | 226    | 0      | 17      | 0     | 243   | ✅     |
    | Create           | 551    | 0      | 67      | 8     | 618   | ✅     |
    | Release          | 15     | 0      | 3       | 0     | 18    | ✅     |
    | Systems          | 8      | 0      | 0       | 0     | 8     | ✅     |
    | Fulfillment      | 8      | 0      | 69      | 0     | 77    | ✅     |
    | GitLab Metrics   | 2      | 0      | 1       | 0     | 3     | ✅     |
    | Monitor          | 36     | 0      | 13      | 0     | 49    | ✅     |
    | Manage           | 40     | 0      | 10      | 4     | 50    | ✅     |
    | Analytics        | 7      | 0      | 0       | 0     | 7     | ✅     |
    | Configure        | 1      | 0      | 9       | 0     | 10    | ✅     |
    | Secure           | 6      | 0      | 3       | 0     | 9     | ✅     |
    | Framework sanity | 0      | 0      | 5       | 0     | 5     | ➖     |
    | Growth           | 0      | 0      | 6       | 0     | 6     | ➖     |
    | ModelOps         | 0      | 0      | 6       | 0     | 6     | ➖     |
    +------------------+--------+--------+---------+-------+-------+--------+
    | Total            | 1704   | 0      | 267     | 34    | 1971  | ✅     |
    +------------------+--------+--------+---------+-------+-------+--------+
  • Chad Woolley approved this merge request

    approved this merge request

    • Resolved by Chad Woolley

      :wave: @cwoolley-gitlab, thanks for approving this merge request.

      This is the first time the merge request has been approved. Please ensure the e2e:package-and-test-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.

  • Chad Woolley resolved all threads

    resolved all threads

  • Chad Woolley mentioned in commit 092baa31

    mentioned in commit 092baa31

  • merged

Please register or sign in to reply
Loading