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

3.10 test fixes #10314

Merged
merged 4 commits into from
Sep 5, 2024
Merged

3.10 test fixes #10314

merged 4 commits into from
Sep 5, 2024

Conversation

evgeni
Copy link
Member

@evgeni evgeni commented Sep 5, 2024

  • Fixes #37607 - pin FFI to < 1.17 for Ruby 2.7
  • Fixes #37613 - compare parsed YAML results, not Strings
  • Fixes #37610 - pass the unencrypted root_pass to crypt for grub_pass

@evgeni
Fixes #37607 - pin FFI to < 1.17 for Ruby 2.7
173c681 
FFI 1.17 needs rubygems 3.3.22+, which is Ruby 3.0+ only

(cherry picked from commit f2e6bca)
@evgeni
Fixes #37613 - compare parsed YAML results, not Strings
432f2a7 
depending on the libyaml version, it encodes `nil` differently and thus
the tests fail on newer versions as the *string* comparison fails.
if we parse the generated yaml back into a Hash, things compare just
fine again, without breaking the tests on older libyaml versions.

(cherry picked from commit 7b1d442)
@evgeni
Fixes #37610 - pass the unencrypted root_pass to crypt for grub_pass
58532fa 
self.root_pass can be already encrypted, and in the case of
Base64(-Windows) we do not reliably detect that. And even if, using B64
for GRUB wouldn't work anyway.

Fixes: 60d53c2
(cherry picked from commit 79c9292)
@evgeni evgeni requested a review from a team as a code owner September 5, 2024 09:47
@pr-processor pr-processor bot added Not yet reviewed Stable branch PRs that are opened against a stable branch. Usually a cherry pick labels Sep 5, 2024
@evgeni evgeni merged commit f2aef85 into theforeman:3.10-stable Sep 5, 2024
50 of 52 checks passed
@evgeni evgeni deleted the 3.10-test-fixes branch September 5, 2024 10:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ekohl ekohl ekohl approved these changes

Assignees
No one assigned
Labels
Stable branch PRs that are opened against a stable branch. Usually a cherry pick Waiting on contributor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@evgeni @ekohl