[RHELC-1385] Satellite package backup failure fix #1182

pr-watson · 2024-04-12T17:55:45Z

This PR changes our backups to now backup the redhat.repo file when running with satellite. The reason backups were failing on satellite was due to the redhat.repo file being excluded from backups which in turn causes the .repo files not to be backed up. This change also removes the requirement for internet access to backup using hardcoded repository files and defaults to always using the the hardcoded repository files.

A similiar failure with backing up repo files has been reported for offline conversions with satellite - RHELC-1040, however this PR does not fix the issue

Jira Issues:

RHELC-1385

Checklist

PR has been tested manually in a VM (either author or reviewer)
Jira issue has been made public if possible
[RHELC-] is part of the PR title
GitHub label has been added to help with Release notes
PR title explains the change from the user's point of view
Code and tests are documented properly
The commits are squashed to as few commits as possible (without losing data)
When merged: Jira issue has been updated to Release Pending if relevant

has-bot · 2024-04-12T17:55:59Z

/packit test --labels tier0

Comment generated by an automation.

Log | Bot Usage

codecov · 2024-04-12T17:57:48Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 95.55%. Comparing base (0cbfd75) to head (6f9b687).

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1182      +/-   ##
==========================================
+ Coverage   95.53%   95.55%   +0.01%     
==========================================
  Files          53       53              
  Lines        4660     4656       -4     
  Branches      818      816       -2     
==========================================
- Hits         4452     4449       -3     
  Misses        130      130              
+ Partials       78       77       -1

Flag	Coverage Δ
centos-linux-7	`90.68% <100.00%> (+0.01%)`	⬆️
centos-linux-8	`91.65% <100.00%> (+0.01%)`	⬆️
centos-linux-9	`91.70% <100.00%> (+0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

convert2rhel/actions/pre_ponr_changes/backup_system.py

r0x0d · 2024-04-12T19:02:52Z

/packit test --labels tier0

convert2rhel/actions/system_checks/duplicate_packages.py

convert2rhel/actions/pre_ponr_changes/backup_system.py

convert2rhel/backup/packages.py

Venefilyn · 2024-04-18T12:04:37Z

Unit tests failing @pr-watson

pr-watson · 2024-04-18T14:20:18Z

Unit tests failing @pr-watson

Working on the fixes now

convert2rhel/actions/pre_ponr_changes/backup_system.py

r0x0d

Looks good to me. Only a couple of comments regarding the message we want to inform to the user.

r0x0d

Looks good!

pr-watson · 2024-04-23T17:48:01Z

/packit build

pr-watson · 2024-04-23T19:47:38Z

/packit test --labels tier0

danmyway · 2024-04-24T13:28:20Z

Just tested the build with a Satellite registration and the backup works fine.

Venefilyn · 2024-04-24T13:44:07Z

@danmyway merge whenever

pr-watson · 2024-04-24T14:00:13Z

/packit test --labels tier0

danmyway

Found a minor bug breaking the backup on some systems @pr-watson

convert2rhel/actions/pre_ponr_changes/backup_system.py

THe should_subscribe call was missing a `()` to execute the function.

Co-authored-by: Rodolfo Olivieri <rodolfo.olivieri3@gmail.com>

pr-watson · 2024-04-24T15:12:53Z

/packit test --labels tier0

danmyway

Looks good to me, thanks!

danmyway · 2024-04-26T07:09:19Z

@pr-watson I'm merging this
@r0x0d this might resolve the issues in #1181, if you may pull the changes from @kokesak and rebase, so we can see, how that's going.
Thanks!

pr-watson · 2024-04-26T13:32:36Z

@danmyway thank you!

pr-watson added kind/feature New feature or request tests/tier0 PR ready to run the essential test suit. Equivalent to `/packit test --labels tier0`. labels Apr 12, 2024

pr-watson force-pushed the satellite-backup-failure branch from 9679585 to 84d8719 Compare April 12, 2024 17:56

github-advanced-security bot found potential problems Apr 12, 2024

View reviewed changes

convert2rhel/actions/pre_ponr_changes/backup_system.py Fixed Show resolved Hide resolved

Venefilyn changed the title ~~Satellite package backup failure fix~~ [RHELC-1385] Satellite package backup failure fix Apr 15, 2024

Venefilyn reviewed Apr 15, 2024

View reviewed changes

pr-watson force-pushed the satellite-backup-failure branch from 9d8093f to 0b773bc Compare April 16, 2024 21:03

pr-watson marked this pull request as draft April 23, 2024 13:49

pr-watson marked this pull request as ready for review April 23, 2024 14:25

r0x0d reviewed Apr 23, 2024

View reviewed changes

convert2rhel/actions/pre_ponr_changes/backup_system.py Outdated Show resolved Hide resolved

r0x0d reviewed Apr 23, 2024

View reviewed changes

convert2rhel/actions/pre_ponr_changes/backup_system.py Outdated Show resolved Hide resolved

r0x0d reviewed Apr 23, 2024

View reviewed changes

convert2rhel/actions/pre_ponr_changes/backup_system.py Outdated Show resolved Hide resolved

r0x0d reviewed Apr 23, 2024

View reviewed changes

pr-watson force-pushed the satellite-backup-failure branch from 601a020 to 7149a08 Compare April 23, 2024 16:05

r0x0d approved these changes Apr 23, 2024

View reviewed changes

danmyway requested changes Apr 24, 2024

View reviewed changes

convert2rhel/actions/pre_ponr_changes/backup_system.py Outdated Show resolved Hide resolved

pr-watson added 4 commits April 24, 2024 10:09

[RHELC-1385] Fix package backup when running convert2rhel with Satellite

ee25c26

Use repo files regardless if there is internet

82d64a2

Suggestions from code review

7c650b2

Reaarrange repo loop

b481dff

pr-watson and others added 6 commits April 24, 2024 10:09

Draft state

c412606

Fix should_subscribe call in backup_system module

cd1c0a7

THe should_subscribe call was missing a `()` to execute the function.

Modify unit tests

3ac5605

Apply suggestions from code review

198e443

Co-authored-by: Rodolfo Olivieri <rodolfo.olivieri3@gmail.com>

Adjust unit tests

11917bf

Adjust conditionals and improve logs

6f9b687

pr-watson force-pushed the satellite-backup-failure branch from 7149a08 to 6f9b687 Compare April 24, 2024 14:15

danmyway approved these changes Apr 26, 2024

View reviewed changes

danmyway merged commit 8e69e8a into oamg:main Apr 26, 2024
33 checks passed

hosekadam mentioned this pull request May 27, 2024

Bump version to 2.0.0 #1243

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RHELC-1385] Satellite package backup failure fix #1182

[RHELC-1385] Satellite package backup failure fix #1182

pr-watson commented Apr 12, 2024 •

edited

Loading

has-bot commented Apr 12, 2024

codecov bot commented Apr 12, 2024 •

edited

Loading

r0x0d commented Apr 12, 2024

Venefilyn commented Apr 18, 2024

pr-watson commented Apr 18, 2024

r0x0d left a comment

r0x0d left a comment

pr-watson commented Apr 23, 2024

pr-watson commented Apr 23, 2024

danmyway commented Apr 24, 2024

Venefilyn commented Apr 24, 2024

pr-watson commented Apr 24, 2024

danmyway left a comment

pr-watson commented Apr 24, 2024

danmyway left a comment

danmyway commented Apr 26, 2024

pr-watson commented Apr 26, 2024

[RHELC-1385] Satellite package backup failure fix #1182

[RHELC-1385] Satellite package backup failure fix #1182

Conversation

pr-watson commented Apr 12, 2024 • edited Loading

has-bot commented Apr 12, 2024

codecov bot commented Apr 12, 2024 • edited Loading

Codecov Report

r0x0d commented Apr 12, 2024

Venefilyn commented Apr 18, 2024

pr-watson commented Apr 18, 2024

r0x0d left a comment

Choose a reason for hiding this comment

r0x0d left a comment

Choose a reason for hiding this comment

pr-watson commented Apr 23, 2024

pr-watson commented Apr 23, 2024

danmyway commented Apr 24, 2024

Venefilyn commented Apr 24, 2024

pr-watson commented Apr 24, 2024

danmyway left a comment

Choose a reason for hiding this comment

pr-watson commented Apr 24, 2024

danmyway left a comment

Choose a reason for hiding this comment

danmyway commented Apr 26, 2024

pr-watson commented Apr 26, 2024

pr-watson commented Apr 12, 2024 •

edited

Loading

codecov bot commented Apr 12, 2024 •

edited

Loading