Skip to content
Snippets Groups Projects

Ci Services migrate

Merged Ci Services migrate
ci-services-migrate into master
Merged Kamil Trzcińśki requested to merge ci-services-migrate into master

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
  • Kamil Trzcińśki Added 136 commits:

    Added 136 commits:

    • 466ce463...abf54f23 - 134 commits from branch master
    • 4799d1c3 - Remove WebHooks
    • 6f1bace2 - Merge remote-tracking branch 'origin/master' into ci-services-migrate
  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan ·
    Author Maintainer

    @dzaporozhets @DouweM

    • This migrates Ci::Services and Ci::WebHooks to Services and WebHooks,
    • It exposes a new build_event,
    • It will migrate existing WebHooks,
    • It doesn't migrate existing services (not sure how to do this),
    • It doesn't migrate mail settings (not sure how to do this),
    • It renames EmailsOnPush service adding build_events,
    • It extends Slack and HipChat services to support build events,
    • It removes Ci::Services and Ci::WebHooks completely - it leaves DB data intact for now,
    • The migrations can be done online,
    • It removes WebHook specific API,
    • Almost all tests are done,
    Edited by Kamil Trzcińśki
  • username-removed-444
  • username-removed-444
    username-removed-444 @dzaporozhets ·
    Owner

    I had a call with @ayufan about this and !1987 (merged) merge requests. We should merge both in one release since it will require offline migration. Some data can not be properly migrated - it should be mentioned in blog post. We want to finish and merge it in 8.3. This is the last big CI cleanup after 8.0. Estimate for merge !1985 (merged) and !1987 (merged) is next Wednesday. @DouweM @rspeicher please find a bit of time to make review of it

  • username-removed-444 Milestone changed to 8.3

    Milestone changed to 8.3

  • Robert Speicher
    Robert Speicher @rspeicher ·
    Owner

    Let's also not forget that there are likely to be a lot of merge conflicts in EE as methods get moved around in these two models.

  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan ·
    Author Maintainer

    @rspeicher I will also handle merge to EE.

  • Kamil Trzcińśki Reassigned to @ayufan

    Reassigned to @ayufan

  • Kamil Trzcińśki Added 76 commits:

    Added 76 commits:

    • 6f1bace2...104df74f - 75 commits from branch master
    • 50a2c373 - Migrate CI::Services and CI::WebHooks to Services and WebHooks
  • Kamil Trzcińśki Added 1 commit:

    Added 1 commit:

    • 1418c5d6 - Fix rubocop offenses
  • Kamil Trzcińśki Added 1 commit:

    Added 1 commit:

    • 41fe8bf6 - Fix spinach offenses
  • Kamil Trzcińśki Added 1 commit:

    Added 1 commit:

    • 9aa0b7ae - Fix tests
  • Kamil Trzcińśki Added 26 commits:

    Added 26 commits:

    • 9aa0b7ae...e88fd586 - 25 commits from branch master
    • 4a53b503 - Migrate CI::Services and CI::WebHooks to Services and WebHooks
  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan ·
    Author Maintainer

    @dzaporozhets @DouweM it's green!

  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan ·
    Author Maintainer

    We miss mostly documentation update and db migration to finish it.

  • username-removed-444
    username-removed-444 @dzaporozhets ·
    Owner

    @ayufan I cannot review line-by-line since I loose focus with such big diff pretty fast 😃 . But changes in general looks good. Please proceed with db migration since it requires most of attention

  • Kamil Trzcińśki mentioned in issue #3474 (closed)

    mentioned in issue #3474 (closed)

  • Douwe Maan
    Douwe Maan @DouweM started a thread on the diff
    • app/mailers/ci/emails/builds.rb → app/mailers/emails/builds.rb
    File renamed with no changes. Show file contents
  • Douwe Maan
  • Douwe Maan
  • Douwe Maan
    Douwe Maan @DouweM started a thread on the diff
    • app/models/project_services/hipchat_service.rb
    250 268 def is_update?(data)
    251 269 data[:object_attributes][:action] == 'update'
    252 270 end
    271
    272 def should_build_be_notified?(data)
  • Douwe Maan
  • Douwe Maan
    Douwe Maan @DouweM started a thread on the diff
    • app/views/ci/notify/build_fail_email.html.haml → app/views/notify/build_fail_email.html.haml
    File renamed with no changes. Show file contents
  • Douwe Maan
    Douwe Maan @DouweM started a thread on the diff
    • app/workers/build_email_worker.rb 0 → 100644
    1 class BuildEmailWorker
    2 include Sidekiq::Worker
    3
    4 def perform(build_id, recipients, push_data)
    5 recipients.split(' ').each do |recipient|
    6 begin
    7 case push_data['build_status']
    8 when 'success'
    9 Notify.build_success_email(build_id, recipient).deliver_now
  • Douwe Maan
  • Kamil Trzcińśki Added 212 commits:

    Added 212 commits:

    • 4a53b503...9bfd6c44 - 210 commits from branch master
    • 7aff5dc6 - Migrate CI::Services and CI::WebHooks to Services and WebHooks
    • cc696eec - Migrate CI WebHooks and Emails to new tables
  • Kamil Trzcińśki
    Kamil Trzcińśki @ayufan ·
    Author Maintainer

    @DouweM Please let me know what you think. I added migrations to migrate all CI::WebHook and CI::EmailService data.

  • Kamil Trzcińśki Added 1 commit:

    Added 1 commit:

    • 8e8f9fcf - Migrate SlackService and HipChat service
  • Kamil Trzcińśki Added 73 commits:

    Added 73 commits:

    • 8e8f9fcf...bdc62d70 - 70 commits from branch master
    • 609d40a0 - Migrate CI::Services and CI::WebHooks to Services and WebHooks
    • d8d544b3 - Migrate CI WebHooks and Emails to new tables
    • 8c83e6ba - Migrate SlackService and HipChat service
    Toggle commit list
  • username-removed-5302
  • Kamil Trzcińśki Added 39 commits:

    Added 39 commits:

    • 8c83e6ba...4e5897f5 - 35 commits from branch master
    • 2988e1fb - Migrate CI::Services and CI::WebHooks to Services and WebHooks
    • d5c91bb9 - Migrate CI WebHooks and Emails to new tables
    • 80f8074d - Migrate SlackService and HipChat service
    • c4fa894d - Fix specs
    Toggle commit list
  • Kamil Trzcińśki Added 1 commit:

    Added 1 commit:

  • Kamil Trzcińśki Added 2 commits:

    Added 2 commits:

  • Douwe Maan
  • Douwe Maan
  • Douwe Maan
    Douwe Maan @DouweM ·
    Maintainer

    @ayufan Two tiny little things, but otherwise looks good. You can merge after those are fixed.

  • Kamil Trzcińśki Added 1 commit:

    Added 1 commit:

    • 8b4cdc50 - Fix indentation and BuildsEmailService
  • Kamil Trzcińśki Title changed from WIP: Ci Services migrate to Ci Services migrate

    Title changed from WIP: Ci Services migrate to Ci Services migrate

  • Kamil Trzcińśki Added 1 commit:

    Added 1 commit:

  • Kamil Trzcińśki mentioned in commit e81ae1e6

    mentioned in commit e81ae1e6

  • Kamil Trzcińśki Status changed to merged

    Status changed to merged

  • username-removed-100770 mentioned in issue #19158 (closed)

    mentioned in issue #19158 (closed)

  • Douwe Maan Mentioned in commit 04def4d8

    Mentioned in commit 04def4d8

  • Douwe Maan Mentioned in commit 8a866bfc

    Mentioned in commit 8a866bfc

    • Please register or sign in to reply