Fix amzn2 tests pipeline

[danmyway]

Jira Issues:

Checklist

• PR has been tested manually in a VM (either author or reviewer)
• Jira issue has been made public if possible
• [RHELC-] or [HMS-] is part of the PR title
• Label depicting the kind of PR it is
• 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

[sourcery-ai]

Reviewer's Guide

Adds full Amazon Linux 2 (amzn2) support and robustness improvements to the convert2rhel pipeline by refining system detection, kernel and GRUB handling, yum/dnf variable backup/restore, package/query helpers, and associated tests.

Sequence diagram for yum variable backup, package removal, and restore

sequenceDiagram
    participant Conv as ConversionController
    participant BUVar as BackUpYumVariables
    participant PKG as pkghandler
    participant Bkp as backup_backup_control
    participant RmPkgs as RemoveSpecialPackages
    participant RstVar as RestoreYumVarFiles
    participant FS as Filesystem

    Conv->>BUVar: run()
    BUVar->>PKG: get_installed_pkg_objects(repofile_pkg)
    PKG-->>BUVar: list of installed pkg objects
    loop for each pkg_name
        BUVar->>PKG: get_files_owned_by_package(pkg_name)
        PKG-->>BUVar: list of paths
    end
    BUVar->>BUVar: _get_yum_var_files_owned_by_pkgs()
    BUVar->>Bkp: push(RestorableFile(filepath))
    Bkp-->>BUVar: ack

    Conv->>RmPkgs: run()
    RmPkgs->>PKG: remove_pkgs(pkgs_to_remove)
    PKG->>FS: remove package files and yum var files
    FS-->>PKG: done

    Conv->>RstVar: run()
    RstVar->>Bkp: get_backed_up_yum_var_dirs()
    Bkp-->>RstVar: {orig_dir: backup_dir}
    loop for each backed up var file
        RstVar->>FS: copy2(backup_file, orig_dir)
        FS-->>RstVar: file copied
        RstVar->>Bkp: push(InstalledFile(restored_filepath))
        Bkp-->>RstVar: ack
    end

Loading

Class diagram for new yum variable backup and InstalledFile handling

classDiagram
    class RestorableChange {
        <<abstract>>
        +bool enabled
        +enable()
        +restore()
    }

    class RestorableFile {
        +str filepath
        +enable()
        +restore()
    }

    class InstalledFile {
        +str filepath
        +enable()
        +restore()
    }

    class BackupController {
        +push(change)
        +restore_all()
    }

    class BackUpYumVariables {
        +str id
        +list yum_var_dirs
        +run()
        -_get_yum_var_files_owned_by_pkgs(pkg_names)
        -_back_up_var_files(paths)
    }

    class RestoreYumVarFiles {
        +str id
        +tuple dependencies
        +run()
    }

    class pkghandler {
        +get_installed_pkg_objects(name, version, release, arch)
        +get_files_owned_by_package(installed_pkg_name)
    }

    class backup_module {
        +backup_control : BackupController
        +get_backedup_system_repos()
        +get_backed_up_yum_var_dirs()
    }

    RestorableChange <|-- RestorableFile
    RestorableChange <|-- InstalledFile

    backup_module o-- BackupController

    BackUpYumVariables --> backup_module : uses backup_control.push
    BackUpYumVariables --> RestorableFile : creates
    BackUpYumVariables --> pkghandler : uses get_installed_pkg_objects
    BackUpYumVariables --> pkghandler : uses get_files_owned_by_package

    RestoreYumVarFiles --> backup_module : uses get_backed_up_yum_var_dirs
    RestoreYumVarFiles --> InstalledFile : creates
    RestoreYumVarFiles --> backup_module : uses backup_control.push

Loading

Flow diagram for Amazon Linux 2 specific conversion logic

flowchart TD
    A[Start convert2rhel on source system] --> B[SystemInfo.parse_system_release_content reads /etc/system-release]
    B --> C{version.major == 2}

    C -- no --> Z[Proceed with standard RHEL or other distro flow]

    C -- yes --> D[Load amazon-2-x86_64.cfg
system_info.repofile_pkgs includes system-release and amazon-linux-extras]
    D --> E[Backup yum variables
BackUpYumVariables]
    E --> F[Backup repositories and other pre PONR steps]

    F --> G[Kernel checks
RhelCompatibleKernel]
    G --> H{Kernel compatible with target RHEL version}
    H -- no --> I[On AL2: log warning
INCOMPATIBLE_KERNEL_ON_AL2
allow continuation]
    H -- yes --> J[Continue]

    I --> J

    J --> K[Conversion actions
package changes]
    K --> L[RestoreYumVarFiles restores yum vars from backup]

    L --> M[FixDefaultKernel
ensure /etc/sysconfig/kernel exists
set DEFAULTKERNEL]
    M --> N[FixGrubSettingsOnAL2
if version.major == 2
update GRUB_TERMINAL]
    N --> O[UpdateGrub rebuilds GRUB config]

    O --> P[HostMeteringRun
reparse system release
check post conversion major version]

    P --> Q[subscription.install_rhel_subscription_manager
uses client tools repofile URL for version.major 2]

    Q --> R[SystemChecks.convert2rhel_latest
uses C2R_REPOFILE_URLS mapping for 2]

    R --> S[Finish conversion with AL2 specific handling completed]

Loading

File-Level Changes

Change	Details	Files
Refactor yum/dnf variable backup into a new action and add restoration of yum var files after special package removal.	Remove old BackupYumVariables action and its unit tests from backup_system tests. Introduce BackUpYumVariables action that discovers yum var files via rpm -ql for packages affecting repo variables, and backs them up via RestorableFile. Introduce RestoreYumVarFiles action that copies backed up yum vars back into /etc/{yum,dnf}/vars and records them as InstalledFile so rollback can remove them. Wire new BACKUP_YUM_VARIABLES action into BackupPackageFiles and RemoveSpecialPackages dependencies. Expose helper backup.get_backed_up_yum_var_dirs with tests and use it from the restore action. Add unit tests for the new yum_variables actions covering discovery, backup, restore, and error handling.	convert2rhel/actions/pre_ponr_changes/backup_system.py convert2rhel/actions/pre_ponr_changes/yum_variables.py convert2rhel/backup/__init__.py convert2rhel/backup/files.py convert2rhel/unit_tests/actions/pre_ponr_changes/backup_system_test.py convert2rhel/unit_tests/actions/pre_ponr_changes/handle_packages_test.py convert2rhel/unit_tests/actions/pre_ponr_changes/test_yum_variables.py convert2rhel/unit_tests/backup/backup_test.py convert2rhel/unit_tests/backup/files_test.py
Extend systeminfo and related logic to recognize Amazon Linux 2, map it to a RHEL7 target, and adjust ELS/EUS, logging, and config resolution.	Add Amazon Linux 2 release parsing and mapping, including RELEASE_VER_MAPPING entry "2" -> "7Server" and tests. Refactor SystemInfo to use a module-level logger and a static parse_system_release_content(system_release_file_content) method that is called with explicit content. Adjust get_system_release_info to optionally take parsed release data and return name/id/version from either parsed input or instance attributes. Allow corresponds_to_rhel_els_release to treat major version 2 like 7 when --els is used. Ensure rpm -Va log file uses LOG_DIR from systeminfo, and fix tests that patch logger/LOG_DIR. Add unit tests asserting correct AL2 id/name/version, releasever, cfg filename amazon-2-x86_64.cfg, and ELS behavior.	convert2rhel/systeminfo.py convert2rhel/unit_tests/systeminfo_test.py
Add Amazon Linux 2 specific configuration, client tools/convert2rhel repo URLs, and integration test tweaks.	Introduce amazon-2-x86_64.cfg with GPG keys, excluded packages, swap_pkgs, repofile_pkgs, repoids, and kernel module ignore list. Add AL2 entries to client tools repofile mapping and convert2rhel latest repofile URLs. Update integration helpers to install system-release on amazon and treat AL2 like RHEL7 for yum-based integration tests (PKGMANAGER selection).	convert2rhel/data/7/x86_64/configs/amazon-2-x86_64.cfg convert2rhel/subscription.py convert2rhel/actions/system_checks/convert2rhel_latest.py tests/integration/test_helpers/workarounds.py tests/integration/tier0/non-destructive/single-yum-transaction-validation/test_single_yum_transaction_validation.py plans/main.fmf
Improve kernel and GRUB handling for AL2 and low-memory environments.	Extend RHEL-compatible kernel checks to support AL2 semantics with COMPATIBLE_KERNELS_VERS[2], an AL2-specific warning result when kernel version is incompatible, and updated error message format. Adjust bad-kernel-version tests and add explicit AL2 kernel tests. Teach FixDefaultKernel action to create /etc/sysconfig/kernel if missing with appropriate DEFAULTKERNEL, and to use a configurable KERNEL_SYSCONFIG_PATH and shared default_kernel logic across versions including AL2. Add tests for missing kernel sysconfig creation and version-dependent DEFAULTKERNEL. Add FixGrubSettingsOnAL2 pre-UPDATE_GRUB action that rewrites GRUB_TERMINAL="ec2-console" to "console" on AL2, backs up the file, and logs behavior; wire it as a dependency and add tests.	convert2rhel/actions/system_checks/rhel_compatible_kernel.py convert2rhel/unit_tests/actions/system_checks/rhel_compatible_kernel_test.py convert2rhel/actions/conversion/preserve_only_rhel_kernel.py convert2rhel/unit_tests/actions/conversion/preserve_only_rhel_kernel_test.py convert2rhel/actions/post_conversion/update_grub.py convert2rhel/unit_tests/actions/post_conversion/update_grub_test.py
Enhance package/query helpers and yum/dnf behavior to be more robust across environments (including AL2).	Document get_installed_pkg_objects return types and add get_files_owned_by_package (rpm -ql wrapper) executed in a child process, with tests for success and failure. Harden get_kernel_availability to handle yum list output without an "Available Packages" section and add tests. Change dnf base.conf.substitutions.update_from_etc() call to stop passing varsdir (only installroot) to rely on defaults and avoid issues. Adjust kernel_modules repoquery invocation to include --archlist and use name-based queries (kernel*, kmod*) instead of -f on EL7 to avoid high memory usage; update tests accordingly. Drop varsdir plumbing from RestorablePackage, utils.download_pkg/download_pkgs, yum handler’s RestorablePackage usage, and associated tests; rely on restored var files instead. Clarify call_yum_cmd setopts docstring (example uses reposdir).	convert2rhel/pkghandler.py convert2rhel/unit_tests/pkghandler_test.py convert2rhel/actions/pre_ponr_changes/kernel_modules.py convert2rhel/unit_tests/actions/pre_ponr_changes/kernel_modules_test.py convert2rhel/backup/packages.py convert2rhel/utils/__init__.py convert2rhel/pkgmanager/__init__.py convert2rhel/pkgmanager/handlers/yum/__init__.py convert2rhel/unit_tests/backup/packages_test.py convert2rhel/unit_tests/pkgmanager/pkgmanager_test.py
Refine backup/restore and certificate behavior and logging.	Introduce InstalledFile RestorableChange that marks a file as planted-on-conversion and removes it on restore, with logging and unit tests; used for restored yum var files. Adjust certificate backup to treat OSError and IOError uniformly and emit a version-agnostic critical_no_exit message; update tests to match new log text.	convert2rhel/backup/files.py convert2rhel/unit_tests/backup/files_test.py convert2rhel/backup/certs.py convert2rhel/unit_tests/backup/certs_test.py
Align breadcrumbs and host metering with new SystemInfo parsing and AL2-to-RHEL7 conversions.	Change breadcrumbs target_os detection to reparse /etc/system-release via SystemInfo.parse_system_release_content and pass structured data to system_info.get_system_release_info(). Update hostmetering to reparse the system release file after conversion to determine the effective RHEL major version (e.g., AL2->RHEL7) before deciding whether to configure host metering; update tests to mock the new behavior.	convert2rhel/breadcrumbs.py convert2rhel/actions/post_conversion/hostmetering.py convert2rhel/unit_tests/actions/post_conversion/hostmetering_test.py convert2rhel/unit_tests/actions/post_conversion/modified_rpm_files_diff_test.py

---

Tips and commands

Interacting with Sourcery

• Trigger a new review: Comment @sourcery-ai review on the pull request.
• Continue discussions: Reply directly to Sourcery's review comments.
• Generate a GitHub issue from a review comment: Ask Sourcery to create an
  issue from a review comment by replying to it. You can also reply to a
  review comment with @sourcery-ai issue to create an issue from it.
• Generate a pull request title: Write @sourcery-ai anywhere in the pull
  request title to generate a title at any time. You can also comment
  @sourcery-ai title on the pull request to (re-)generate the title at any time.
• Generate a pull request summary: Write @sourcery-ai summary anywhere in
  the pull request body to generate a PR summary at any time exactly where you
  want it. You can also comment @sourcery-ai summary on the pull request to
  (re-)generate the summary at any time.
• Generate reviewer's guide: Comment @sourcery-ai guide on the pull
  request to (re-)generate the reviewer's guide at any time.
• Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
  pull request to resolve all Sourcery comments. Useful if you've already
  addressed all the comments and don't want to see them anymore.
• Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
  request to dismiss all existing Sourcery reviews. Especially useful if you
  want to start fresh with a new review - don't forget to comment
  @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

• Enable or disable review features such as the Sourcery-generated pull request
  summary, the reviewer's guide, and others.
• Change the review language.
• Add, remove or edit custom review instructions.
• Adjust other review settings.

Getting Help

• Contact our support team for questions or feedback.
• Visit our documentation for detailed guides and information.
• Keep in touch with the Sourcery team by following us on X/Twitter, LinkedIn or GitHub.

[codecov]

Codecov Report

❌ Patch coverage is 97.19626% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 96.17%. Comparing base (bee0696) to head (944b464).
⚠️ Report is 33 commits behind head on main.

Files with missing lines	Patch %	Lines
...ert2rhel/actions/pre_ponr_changes/yum_variables.py	95.23%	2 Missing and 1 partial ⚠️
convert2rhel/systeminfo.py	92.85%	2 Missing ⚠️
...onvert2rhel/actions/post_conversion/update_grub.py	97.14%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1486      +/-   ##
==========================================
+ Coverage   96.11%   96.17%   +0.05%     
==========================================
  Files          72       73       +1     
  Lines        5176     5309     +133     
  Branches      895      922      +27     
==========================================
+ Hits         4975     5106     +131     
- Misses        119      120       +1     
- Partials       82       83       +1     

Flag	Coverage Δ
centos-linux-7	91.80% <96.69%> (+0.16%)	⬆️
centos-linux-8	92.63% <97.16%> (+0.14%)	⬆️
centos-linux-9	92.76% <97.19%> (+0.14%)	⬆️

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.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[has-bot]

This PR does not require integration tests to be run.

---

Comment generated by an automation.

Log | Bot Usage

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels sanity

[danmyway]

/packit test --labels amzn2

[danmyway]

/packit test --labels sanity