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.

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

Fixes #36505 - Add back missing SCA code to release branch #10605

Merged
merged 1 commit into from
Jun 15, 2023

Conversation

jeremylenz
Copy link
Member

@jeremylenz jeremylenz commented Jun 14, 2023

What are the changes introduced in this pull request?

A few lines of code were left out when backporting #10515 into Katello 4.8 and 4.7. See the redmine issue for details

Considerations taken when implementing this change?

What are the testing steps for this pull request?

Check out the branch
bundle update
Register a host in a non-SCA org
Sync some custom content, but do not attach a subscription
Turn on SCA in the org
Look for the output of the Actions::Katello::Organization::SimpleContentAccess::PrepareContentOverrides subtask in the Dynflow console under "Enable Simple Content Access"

Before:

# Actions::Katello::Organization::SimpleContentAccess::PrepareContentOverrides (success) [ 0.07s / 0.07s ]
---
migrator_result:
result: Finished creating overrides in non-SCA orgs; 2 errors
errors: 2
host_errors: Hosts - 1 error creating disabled overrides for unsubscribed content;
see log messages above
ak_errors: Activation keys - 1 error creating disabled overrides for unsubscribed
content; see log messages above

After:

migrator_result:
  result: Finished creating overrides in non-SCA orgs; no errors
  errors: 0
  success_message: Organization may now be switched to Simple Content Access mode without any change in access to content.

Also, in Repository Sets for the host, you'll see a disabled override for your custom repo.

@theforeman-bot
Copy link

Issues: #36505

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, works tested on a production katello 4.8 install

  • Followed testing steps and I can see the task after flipping SCA on in the Partha org
    Screenshot 2023-06-15 at 13-52-26 Tasks

Will test on 4.7 next for the other pr

Code looks fine as well

@chris1984
Copy link
Member

chris1984 commented Jun 15, 2023

Screenshot of host showing disabled

host

Screenshot showing task completed
task

@jeremylenz jeremylenz merged commit 4a3c5bf into Katello:KATELLO-4.8 Jun 15, 2023
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants