-
Notifications
You must be signed in to change notification settings - Fork 898
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
Fix Embedded Ansible Plays in the Job UI (v2/rebased with master) #19247
Merged
agrare
merged 3 commits into
ManageIQ:master
from
NickLaMuro:embedded_ansible_fix_plays_output_v2
Sep 3, 2019
Merged
Fix Embedded Ansible Plays in the Job UI (v2/rebased with master) #19247
agrare
merged 3 commits into
ManageIQ:master
from
NickLaMuro:embedded_ansible_fix_plays_output_v2
Sep 3, 2019
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds a method for collecting the plays for a given playbook run, itemizing them and determining the elapsed time for each. Very similar to the code found in the `manageiq-providers-ansible_tower` code: https://github.com/ManageIQ/manageiq-providers-ansible_tower/blob/88aa135c/app/models/manageiq/providers/ansible_tower/shared/automation_manager/job.rb#L117-L144 The difference here is that the code that fetches the play events is using an wrapper model class around the event data. By contrast, the code here is working with raw hashes instead, though most of the keys do end up aligning with the method names from the tower code since the wrapper models are `HashModel` objects. https://bugzilla.redhat.com/show_bug.cgi?id=1741883
kbrock
requested changes
Sep 3, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just the 1 change
spec/models/manageiq/providers/embedded_ansible/automation_manager/job_spec.rb
Show resolved
Hide resolved
app/models/manageiq/providers/embedded_ansible/automation_manager/job.rb
Show resolved
Hide resolved
spec/models/manageiq/providers/embedded_ansible/automation_manager/job_spec.rb
Show resolved
Hide resolved
A complete rip from what is is `manageiq-providers-ansible_tower`: https://github.com/ManageIQ/manageiq-providers-ansible_tower/blob/88aa135c/app/models/manageiq/providers/ansible_tower/shared/automation_manager/job.rb#L70-L72 https://bugzilla.redhat.com/show_bug.cgi?id=1741883
- Minor refactor to make the finish_time setting a little clearer from a readbility perspective - Add a spec to demonstrate that non-play events are skipped - Modify the times in the spec to be much farther apart and use Timecop.freeze to avoid potential time-based sproadic test failures. - Some rubocops https://bugzilla.redhat.com/show_bug.cgi?id=1741883
NickLaMuro
force-pushed
the
embedded_ansible_fix_plays_output_v2
branch
from
September 3, 2019 19:14
31bc4d3
to
3d6bcf8
Compare
Checked commits NickLaMuro/manageiq@7702e4e~...3d6bcf8 with ruby 2.4.6, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0 app/models/manageiq/providers/embedded_ansible/automation_manager/job.rb
|
agrare
approved these changes
Sep 3, 2019
simaishi
pushed a commit
that referenced
this pull request
Sep 4, 2019
…output_v2 Fix Embedded Ansible Plays in the Job UI (v2/rebased with master) (cherry picked from commit 01a516a) https://bugzilla.redhat.com/show_bug.cgi?id=1741883
Ivanchuk backport details:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rebased version of #19236 with the original text below
Links