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

[CP] Katello 4.9.2 #10726

Merged
merged 27 commits into from
Sep 27, 2023
Merged

[CP] Katello 4.9.2 #10726

merged 27 commits into from
Sep 27, 2023

Conversation

wbclark
Copy link
Contributor

@wbclark wbclark commented Sep 7, 2023

What are the changes introduced in this pull request?

Considerations taken when implementing this change?

What are the testing steps for this pull request?

sjha4 and others added 25 commits September 6, 2023 11:53
@sjha4 @wbclark
Fixes #36577 - Filter gets applied to all the repository upon removal (…
52146d1 
…Katello#10640)

* Fixes #36577 - Filter gets applied to all the repository upon removal of repository for which the filter was created.

* Fixes #36577 - Handle bulk repo and product deletion

(cherry picked from commit 49a55b1)
@evgeni @wbclark
Fixes #36497 - Allow unsetting GPG and SSL keys (Katello#10593)
205545a 
(cherry picked from commit 5dc7382)
@snagoor @wbclark
Fixes #36506 - allow installable errata counts in safe mode
b3b522e 
(cherry picked from commit f3dba82)
@sjha4 @wbclark
Fixes #36500 - Optimize DockerMetaTag query and CV version deletion t…
75d7727 
…o run a single invocation of the method (Katello#10599)

(cherry picked from commit 6077a1e)
@sjha4 @wbclark
Fixes #36593 - Repository details page shouldn't say 'enabled by defa…
6f875c6 
…ult' (Katello#10673)

(cherry picked from commit 6b1d742)
@jeremylenz @wbclark
Fixes #36430 - Get arch restriction data from root, not repositories (K…
f1b299e 
…atello#10581)

* Fixes #36430 - Get arch restriction data from product, not repositories
  so that arch restriction labels show up properly in RepositorySetsTab

(cherry picked from commit 338eb1d)
@jeremylenz @wbclark
Fixes #36504 - use assign_single_environment in bulk action (Katello#…
b473fc8 
…10615)

(cherry picked from commit ccd234a)
@jeremylenz @wbclark
Fixes #36498 - Don't try to unset a host's CV/LCE when inheriting fro…
5e954e5 
…m hostgroup (Katello#10595)

* Fixes #36498 - Don't try to unset a host's CV/LCE when inheriting from hostgroup

* Refs #36498 - fix test

(cherry picked from commit 08941da)
@jeremylenz @wbclark
Fixes #36440 - Redefine #attributes= to hijack old content facet attr…
39f269d 
…ibutes (Katello#10600)

* Fixes #36440 - Redefine #attributes= to hijack old content facet attributes

* Refs #36440 - add tests

(cherry picked from commit 0a20051)
@jeremylenz @wbclark
Fixes #36462 - check for presence of content facet before assigning C…
75d7458 
…VE (Katello#10602)

* Fixes #36462 - check for presence of content facet
  before assigning CVE

(cherry picked from commit 2fdd82a)
@lumarel @wbclark
Fixes #36516 - Add trailing / to CV RPM search autocomplete endpoint (K…
0a4e609 
…atello#10618)

(cherry picked from commit 76fdd41)
@jeremylenz @wbclark
Fixes #36526 - Add banners warning about katello-agent removal (Katel…
fd02f22 
…lo#10626)

(cherry picked from commit e59f07d)
@jeremylenz @wbclark
Refs #36526 - remove duplicate banners from applicable and installed …
9b4f1df 
…pages (Katello#10636)

(cherry picked from commit 74d8bd6)
@lfu @wbclark
Fixes #36521 - raise an error with invalid manifest
6fddd0b 
(cherry picked from commit 58dcb48)
@sjha4 @wbclark
Fixes #36523 - Optimized capsule sync doesn't sync recently published…
a71b9c2 
…/promoted docker repositories (Katello#10629)

(cherry picked from commit 1429ec9)
@jeremylenz @wbclark
Fixes #36528 - handle integer hash keys in katello-agent actions (Kat…
2e82d83 
…ello#10627)

(cherry picked from commit f9bf7d0)
@lfu @wbclark
Fixes #36524 - RegistrationManager expects an array for content_view_…
2cb718e 
…environments to register

(cherry picked from commit f579e49)
@sayan3296 @wbclark
Fixes #36562 - Clear RootRepo checksum if on_demand repo
52a75f8 
(cherry picked from commit f0ab69d)
@stejskalleos @wbclark
Fixes #36601 - Error when autoprovision/provision for a discovered host
60f0834 
Foreman throws error undefined method `html_safe' for nil:NilClass
when autoprovision/provision is initiated for a discovered host
without selecting a host group.

(cherry picked from commit e834c88)
@jeremylenz @wbclark
Fixes #36608 - Fix customizing discovered hosts / use safe navigation…
ff6dedc 
… for content facet in host_managed_extensions (Katello#10658)

(cherry picked from commit 5f1e74d)
@ianballou @wbclark
Fixes #36625 - allow verify checksum for all repo types
71f3df2 
(cherry picked from commit 0310103)
@ianballou @wbclark
Fixes #36631 - add file:// to ACS path types
809ee05 
(cherry picked from commit 9b68b00)
@sjha4 @wbclark
Fixes #36622 - Mark needs_publish after reindexing (Katello#10668)
c6d2efc 
(cherry picked from commit 4e3d804)
@evgeni @wbclark
Fixes #36684 - allow single_content_view in ContentFacet::Jail (Katel…
47fac47 
…lo#10699)

Otherwise the Ansible Inventory report template doesn't render properly
when Safe Mode is on.

Same for single_lifecycle_environment and KTEnvironment#id.

Fixes: c33da7a
(cherry picked from commit 0569063)
@lfu @wbclark
Fixes #36667 - Hammer should fail non-existent LCE in host update
9740780 
(cherry picked from commit 05b73f7)
@wbclark
Copy link
Contributor Author

wbclark commented Sep 7, 2023

Something is still not correct with changelog generation. Most of the cherry-picked issues do not appear in the changelogs.

@wbclark wbclark mentioned this pull request Sep 7, 2023
Closed
@ianballou
Copy link
Member

Looks like some of these commits are tied to redmine issues triaged to 4.10:

b3b522e => https://projects.theforeman.org/issues/36506

205545a => https://projects.theforeman.org/issues/36497

Since the cherry picking work was already done, I say we can re-triage these to 4.9, but I'm wondering now how the cherry picks were calculated.

There might be more, I only found two 4.10 ones.

@ekohl
Copy link
Member

ekohl commented Sep 8, 2023

205545a => https://projects.theforeman.org/issues/36497

This one was marked by @parthaa as fixed in 4.9.0, but given it shows up here that clearly wasn't true.

@wbclark
Copy link
Contributor Author

wbclark commented Sep 11, 2023

Looks like some of these commits are tied to redmine issues triaged to 4.10:

b3b522e => https://projects.theforeman.org/issues/36506

205545a => https://projects.theforeman.org/issues/36497

Since the cherry picking work was already done, I say we can re-triage these to 4.9, but I'm wondering now how the cherry picks were calculated.

There might be more, I only found two 4.10 ones.

Some of the other cherry picks had merge conflicts initially. I cherry-picked these to resolve those merge conflicts safely.

@ianballou
Copy link
Member

Some of the other cherry picks had merge conflicts initially. I cherry-picked these to resolve those merge conflicts safely.

Gotcha, that makes more sense now . Mind setting the version back on the redmines to keep the bookkeeping straight?

@ianballou
Copy link
Member

Hey @wbclark are the 4.9.2 redmine versions fixed up? Can the changelog be regenerated? I'd like to get this merged this week so we can wrap up 4.9.2 and have it delivered.

@chris1984
Copy link
Member

What is the status of this?

chris1984
chris1984 approved these changes Sep 26, 2023
View reviewed changes
Copy link
Member

@chris1984 chris1984 left a comment

Choose a reason for hiding this comment

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

ACK pending jenkins

@ianballou
Copy link
Member

There are failing React snapshot tests for some reason. Perhaps another commit is missing?

@ianballou
Copy link
Member

@wbclark looks like we may just need https://projects.theforeman.org/issues/36552 to be CP'd in to fix the failing React tests.

@wbclark
Copy link
Contributor Author

wbclark commented Sep 27, 2023

Cherry-picked https://projects.theforeman.org/issues/36552 , regenerated and validated CHANGELOG.md

@ianballou
Copy link
Member

Thanks, I closed #10754

@ianballou
Copy link
Member

[test katello]

@chris1984
Copy link
Member

@wbclark all green for a 4.9.2 release

@wbclark wbclark merged commit a4b8414 into Katello:KATELLO-4.9 Sep 27, 2023
2 of 3 checks passed
@ekohl
Copy link
Member

ekohl commented Sep 28, 2023

I just verified that the bot indeed did set the Fixed in Releases field correctly upon merge. Glad to confirm that's been fixed now.

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

@chris1984 chris1984 chris1984 approved these changes

Assignees
No one assigned
Labels
Needs re-review Stable branch Waiting on contributor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.