-
Notifications
You must be signed in to change notification settings - Fork 86
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
[RHELC-1494, RHELC-1289] Restore disabled repos during conversion in rollback #1212
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1212 +/- ##
==========================================
+ Coverage 95.55% 95.74% +0.19%
==========================================
Files 54 55 +1
Lines 4720 4752 +32
Branches 829 834 +5
==========================================
+ Hits 4510 4550 +40
+ Misses 127 116 -11
- Partials 83 86 +3
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
/packit test --labels tier0 |
tests/integration/tier0/destructive/offline-system-conversion/test_offline_system_analysis.py
Outdated
Show resolved
Hide resolved
d24850b
to
650007a
Compare
tests/integration/tier0/destructive/offline-system-conversion/test_offline_system_analysis.py
Fixed
Show fixed
Hide fixed
650007a
to
08b37f6
Compare
/packit test --labels tier0 |
tests/integration/tier0/destructive/offline-system-conversion/test_offline_system_analysis.py
Outdated
Show resolved
Hide resolved
/packit test --labels tier0 |
82528d4
to
4ef8e2a
Compare
/packit test --labels tier0 |
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.
Looks good to me
/packit test --labels tier0 |
4ef8e2a
to
ea56a14
Compare
/packit test --labels tier0 |
ea56a14
to
4070a52
Compare
/packit test --labels tier0 |
4070a52
to
59d28af
Compare
/packit test --labels tier0 |
@r0x0d can you rebase this please |
59d28af
to
0c80e0e
Compare
/packit test --labels tier0 |
/packit build |
/packit test --labels tier0 |
Manually retriggered failed tests |
loggerinst.task("Rollback: RHSM-related actions") | ||
|
||
if self.enabled: | ||
try: |
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.
loggerinst.task("Rollback: RHSM-related actions") | |
if self.enabled: | |
try: | |
if self.enabled: | |
loggerinst.task("Rollback: RHSM-related actions") | |
try: |
or
def restore(self):
"""Rollback subscription related changes"""
if not self.enabled:
return
To avoid printing the rollback message when it's not enabled
/packit test --labels tier0 |
...-destructive/enabled-repositories-after-analysis/test_enabled_repositories_after_analysis.py
Show resolved
Hide resolved
tests/integration/tier0/non-destructive/enabled-repositories-after-analysis/main.fmf
Outdated
Show resolved
Hide resolved
...-destructive/enabled-repositories-after-analysis/test_enabled_repositories_after_analysis.py
Outdated
Show resolved
Hide resolved
7968237
to
9e4fada
Compare
/packit test --labels tier0 |
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.
Looks good!
In a satellite analysis/conversion, we are disabling all repositories to not interfer with the rest of the execution. With this commit, we are introducing a way of checking what repositories are enabled prior to disable them, and back the repositories names up. In the rollback phase, we enable the repositories back on the system to leave everything the way it was.
This test will perform the following operations: - Collect the enabled repositories prior to the analysis start - Run the analysis and assert that we successfully enabled the RHSM repositories - Collect the enabled repositories after the tool run to compare with the repositories prior to the analysis
In this commit, we are including the following modications that are worth mentioning: - We are dropping the filter for rhel repositories, so if the user has any rhel repositories enabled before the analysis, we should re-enable them after the analysis is done (alongside any other repository that rhsm reports that is enabled) - Updates to the integration tests to strip the white spaces and compare correctly the list of repositories enabled
Co-authored-by: Martin "kokesak" Litwora <mlitwora@redhat.com>
304e0f3
to
4db54d2
Compare
/packit test --labels tier0 |
4db54d2
to
b29c444
Compare
/packit test --labels tier0 |
b29c444
to
a6297b4
Compare
/packit test --labels tier0 |
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.
Looks good
The following comments are applied in this patch: - oamg#1212 (comment) - oamg#1212 (comment) - oamg#1212 (comment)
The following comments are applied in this patch: - oamg#1212 (comment) - oamg#1212 (comment) - oamg#1212 (comment)
* Apply missing coments from PR#1212 The following comments are applied in this patch: - #1212 (comment) - #1212 (comment) - #1212 (comment)
In a satellite analysis/conversion, we are disabling all repositories to not interfere with the rest of the execution.
With this commit, we are introducing a way of checking what repositories are enabled prior to disable them, and back the repositories names up. In the rollback phase, we enable the repositories back on the system to leave everything the way it was.
Jira Issues:
Checklist
[RHELC-]
is part of the PR titleRelease Pending
if relevantDepends on