Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update rufus-scheduler to 3.6 #19153

Merged
merged 5 commits into from
Aug 16, 2019
Merged

Update rufus-scheduler to 3.6 #19153

merged 5 commits into from
Aug 16, 2019

Conversation

d-m-u
Copy link
Contributor

@d-m-u d-m-u commented Aug 14, 2019

We're using rufus-scheduler 3.1.10.2 and 3.7 is currently in the works.

To get to 3.6, there are three changes necessary:

  1. job frequency was replaced by rough_frequency (jmettraux/rufus-scheduler@ba25015#diff-5d7d9fcb70b7c4ad09e1fa4b2cd82591)
  2. a couple of our runner specs needed updated arguments to not break tagging

we need the patch, darn it:
3) https://github.com/floraison/et-orbi/blob/master/lib/et-orbi/time.rb#L208 pretty much just needs to be replaced with: o = EtOrbi.make_time(o)

updated to of course include the requisite picture of a rufous in all its glory:
Screen Shot 2019-08-14 at 5 13 29 PM

@miq-bot assign @jrafanie

@d-m-u d-m-u changed the title [WIP] Update rufus-scheduler to 3.6 [WIP] Update specs to prepare for moving rufus-scheduler to 3.6 Aug 14, 2019
@d-m-u d-m-u changed the title [WIP] Update specs to prepare for moving rufus-scheduler to 3.6 Update rufus-scheduler to 3.6 Aug 15, 2019
@d-m-u
Copy link
Contributor Author

d-m-u commented Aug 15, 2019

@miq-bot remove_label wip

@miq-bot miq-bot added dependencies and removed wip labels Aug 15, 2019
@d-m-u d-m-u changed the title Update rufus-scheduler to 3.6 Updates necessary to run rufus-scheduler 3.6 Aug 15, 2019
@jrafanie
Copy link
Member

Since it's not trivial to support both old and new rufus, maybe we should bite the bullet:

  • force rufus 3.6+ or whichever version makes the most sense.
  • monkey patch et-orbi to support EtOrbi::Time with Time comparisons in an initializer
  • later, propose the monkey patch to upstream EtOrbi

Profit?

Gemfile Outdated Show resolved Hide resolved
@d-m-u d-m-u force-pushed the rufus_upgrade branch 4 times, most recently from f01c59c to ef5b96c Compare August 15, 2019 17:26
@d-m-u d-m-u changed the title Updates necessary to run rufus-scheduler 3.6 Update rufus-scheduler to 3.6 Aug 15, 2019
@d-m-u d-m-u force-pushed the rufus_upgrade branch 2 times, most recently from f8863a6 to afd612b Compare August 15, 2019 18:23
@d-m-u d-m-u force-pushed the rufus_upgrade branch 2 times, most recently from 629d6e8 to aac56c6 Compare August 15, 2019 20:25
@miq-bot
Copy link
Member

miq-bot commented Aug 15, 2019

Checked commits d-m-u/manageiq@d6bf5b5~...5951553 with ruby 2.4.6, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
5 files checked, 0 offenses detected
Everything looks fine. ⭐

@Fryguy
Copy link
Member

Fryguy commented Aug 16, 2019

a couple of our runner specs needed updated arguments to not break tagging

could specs in other repos run into this issue as well?

@d-m-u
Copy link
Contributor Author

d-m-u commented Aug 16, 2019

UI's green, API's green, what else should I test for this?

@Fryguy
Copy link
Member

Fryguy commented Aug 16, 2019

That's probably fine. Merging.

@Fryguy Fryguy merged commit a8aee20 into ManageIQ:master Aug 16, 2019
@Fryguy Fryguy added this to the Sprint 118 Ending Aug 19, 2019 milestone Aug 16, 2019
@Fryguy
Copy link
Member

Fryguy commented Aug 16, 2019

@simaishi @dmetzger57 I'd like this to be backported because it eliminates a forked gem that we don't want to carry.

@dmetzger57
Copy link
Contributor

I’m good with this. Just need a BZ.

@d-m-u d-m-u mentioned this pull request Aug 19, 2019
@d-m-u
Copy link
Contributor Author

d-m-u commented Aug 19, 2019

simaishi pushed a commit that referenced this pull request Aug 19, 2019
@simaishi
Copy link
Contributor

Ivanchuk backport details:

$ git log -1
commit 63b2fefd3e5c4dea5ec84406e3bea9c3fdb31632
Author: Jason Frey <[email protected]>
Date:   Fri Aug 16 15:04:39 2019 -0400

    Merge pull request #19153 from d-m-u/rufus_upgrade
    
    Update rufus-scheduler to 3.6
    
    (cherry picked from commit a8aee202cf24d4bf1c176a33b0bb6e676fdee655)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1743211

simaishi added a commit that referenced this pull request Aug 21, 2019
@simaishi
Copy link
Contributor

Due to an issue found, reverted the ivanchuk backport (discussed with @d-m-u)

commit b56570cca4852aeeee0a847d599ef9bfa4b62271
Author: Satoe Imaishi <[email protected]>
Date:   Wed Aug 21 15:53:13 2019 -0400

    Revert "Merge pull request #19153 from d-m-u/rufus_upgrade"
    
    This reverts commit 63b2fefd3e5c4dea5ec84406e3bea9c3fdb31632.

@simaishi
Copy link
Contributor

Ivanchuk backport details:

$ git log -1
commit fb24d9c5c8a6b47a6c132150b207ba2f30516bff
Author: Jason Frey <[email protected]>
Date:   Fri Aug 16 15:04:39 2019 -0400

    Merge pull request #19153 from d-m-u/rufus_upgrade
    
    Update rufus-scheduler to 3.6
    
    (cherry picked from commit a8aee202cf24d4bf1c176a33b0bb6e676fdee655)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1743211

@jrafanie
Copy link
Member

🎉 nice work @d-m-u

@d-m-u d-m-u deleted the rufus_upgrade branch September 26, 2019 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants