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.

Sign up for GitHub

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

Jump to bottom

Fixes #35127 - migrate bootdisk templates to Foreman #126

Merged
merged 1 commit into from
Aug 8, 2022
Merged

Fixes #35127 - migrate bootdisk templates to Foreman #126

merged 1 commit into from
Aug 8, 2022

Conversation

nofaralfasi
Copy link
Contributor

@nofaralfasi nofaralfasi commented Jul 20, 2022 •
edited
Loading

Related to this PR on Foreman.
This PR applies a more complex solution for the missing description issue (compared to this PR), and it is intended for Satellite 6.13.

@nofaralfasi nofaralfasi force-pushed the 35127-migrate_templates_to_foreman branch 3 times, most recently from 837b3e8 to 47b778c Compare July 20, 2022 15:25
@nofaralfasi
Copy link
Contributor Author

Working on fixing the tests.

@stejskalleos stejskalleos self-assigned this Jul 21, 2022
stejskalleos
stejskalleos requested changes Jul 21, 2022
View reviewed changes
Copy link
Collaborator

@stejskalleos stejskalleos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • We should also remove template_labels 'Bootdisk' => N_('Boot disk embedded template') from engine.rb
  • For failing tests you have to remove setup_templates in test_helper and then run tests again. Probably fix them same way as in discovery

@nofaralfasi
Copy link
Contributor Author

  • We should also remove template_labels 'Bootdisk' => N_('Boot disk embedded template') from engine.rb
  • For failing tests you have to remove setup_templates in test_helper and then run tests again. Probably fix them same way as in discovery

Thanks @stejskalleos
There are also migrations related to the templates, for example - db/migrate/20171009225200_remove_duplicate_bootdisk_templates.rb.
It looks like it shouldn't be affected and we should keep it the way it is, but I wanted to make sure.

@nofaralfasi nofaralfasi force-pushed the 35127-migrate_templates_to_foreman branch from 47b778c to 031949f Compare July 24, 2022 09:22
@nofaralfasi nofaralfasi mentioned this pull request Jul 27, 2022
Merged
stejskalleos
stejskalleos requested changes Aug 2, 2022
View reviewed changes
test/test_plugin_helper.rb Outdated Show resolved Hide resolved
@nofaralfasi nofaralfasi force-pushed the 35127-migrate_templates_to_foreman branch from 031949f to 1477370 Compare August 3, 2022 08:30
@nofaralfasi nofaralfasi force-pushed the 35127-migrate_templates_to_foreman branch from 1477370 to aafbe00 Compare August 3, 2022 10:05
stejskalleos
stejskalleos approved these changes Aug 8, 2022
View reviewed changes
Copy link
Collaborator

@stejskalleos stejskalleos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🍏 LGTM

@stejskalleos stejskalleos merged commit 913d42b into theforeman:master Aug 8, 2022
@stejskalleos
Copy link
Collaborator

Thanks @nofaralfasi !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stejskalleos stejskalleos stejskalleos approved these changes

Assignees

@stejskalleos stejskalleos

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nofaralfasi @stejskalleos