-
Notifications
You must be signed in to change notification settings - Fork 285
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
[CP] 3.14 RC2 #8447
Merged
Merged
[CP] 3.14 RC2 #8447
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
(cherry picked from commit 771388f)
(cherry picked from commit f4fe99a)
(cherry picked from commit bcf0357)
(cherry picked from commit f041e73)
(cherry picked from commit cae4ae6)
(cherry picked from commit 58e6e6c)
(cherry picked from commit ea533c1)
(cherry picked from commit ebd1ff6)
(cherry picked from commit bf24169)
(cherry picked from commit 40716c1)
(cherry picked from commit 75e9c3f)
(cherry picked from commit 219cac7)
(cherry picked from commit 2e9be1e)
(cherry picked from commit f64edd3)
This commit handles incremental update with additional_repos parameters. Rpms from one repo can depend on rpms from another repo, this is especially true with RHEL 8. This causes a problem during depsolving. For example if we have a module/errata in one repo pointing packages in another repo, we'd like to ideally copy the dependencies across both repositories in the same operation. In the incremental update case for example the user may request a certain errata to be copied over along with their dependencies. To address this Pulp 2.21 updated their copy api to accept "additional repos" (https://pulp.plan.io/issues/5067.) This commit sets up the appropriate mapping for this operation. So if the content view has depsolve turned on or if its incremental katello will create a 'repository_mapping' which maps source repo to a destination repo. The entries in this hash consist of all the repositories in the content view version minus the main one. For example CVV1 - repos A,B On incremental update CVV1 -> CVV 1.1 The copy operation for content in repo A will have {b:dest-b} as the "additional_repos" aka "repository mapping". This mapping is then passed to pulp copy api. This change has a couple of complexities. We need all the destination repositories to be created before we call the copy operations with the addition_repos mapping. To handle this a new CreateRepos plan was created and the CloneToVersion plan was modified to accept a destination repo. The CloneToVersion call now expects the destination repo to have been created before copying. Changes were made to both IncrementalUpdate and Publish plans to accomodate the new structure. (cherry picked from commit 4b52fa6)
(cherry picked from commit 311ab53)
(cherry picked from commit 96a476d)
Original title: subscription-manager register facts create duplicate interface with wrong mac for bond clarify test and differentiate from preceding test extract mac_key logic to private method (cherry picked from commit 7dc9386)
When destroying an organization and environment, audits are created that are linked back to the Taxonomy (org or loc). This creates an issue when the taxonomy has been deleted and audits are created referring to the taxonomy. Issues are seen during concurrent actions (cherry picked from commit 4b59693)
the validator will list them all and that's the important list (cherry picked from commit b17441b)
Cache the list of virtual guests of the hypervisors before going into the database transaction. This will prevent the transaction to lock the updating rows in subscription facet table for long time and causes all RHSM checkin requests to stuck. Also improve the update query to minimize the number of rows to be locked. (cherry picked from commit 5ee0f52)
(cherry picked from commit 02900d1)
Pass the result of async-await into the reload handler so that it works correctly. https://projects.theforeman.org/issues/28238 (cherry picked from commit e9c19db)
* Fixes #28189 - Refresh repo when needed When a manifest refresh is triggered all the RH repos update their distributors and importers, even if those repos did not change. This commit makes a repo update its importers and distributors only if needed. (cherry picked from commit 1237135)
the database attribute 'ignore_global_proxy' has been removed, but some references to it still existed (cherry picked from commit f0827a5)
Looks like there was an update that broke our snapshots: patternfly/patternfly-react@0185bc5 (cherry picked from commit b8d75aa)
(cherry picked from commit 2c9ed1c)
(cherry picked from commit 9c90664)
(cherry picked from commit 3f009c1)
Make the dash have less emphasis in the requires virt who column. https://projects.theforeman.org/issues/24517 (cherry picked from commit 073bf0c)
[test katello] |
1 similar comment
[test katello] |
chris1984
approved these changes
Nov 25, 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.
ACK looks good and tests are green
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.
No description provided.