[RHELC-1332] Port PkgManagerConf() to the Action framework #1321

pr-watson · 2024-07-24T14:58:54Z

This PR calls the PkgManagerConf class inside a new action called pkg_manager_config so it can be executed alongside the other actions in the conversion section. Relevant tests have been written.

Jira Issues:

RHELC-1332

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
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-07-24T14:59:38Z

/packit test --labels sanity

Comment generated by an automation.

Log | Bot Usage

codecov · 2024-07-24T15:01:12Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 96.35%. Comparing base (80333d9) to head (c0b3908).
Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #1321      +/-   ##
==========================================
+ Coverage   96.30%   96.35%   +0.05%     
==========================================
  Files          59       60       +1     
  Lines        4872     4884      +12     
  Branches      858      860       +2     
==========================================
+ Hits         4692     4706      +14     
+ Misses        103      101       -2     
  Partials       77       77

Flag	Coverage Δ
centos-linux-7	`91.67% <100.00%> (+0.06%)`	⬆️
centos-linux-8	`92.58% <100.00%> (+0.06%)`	⬆️
centos-linux-9	`92.62% <100.00%> (+0.05%)`	⬆️

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/unit_tests/actions/conversion/pkg_manager_config_test.py

convert2rhel/actions/conversion/pkg_manager_config.py

convert2rhel/redhatrelease.py

r0x0d

Looks good to me.

The only thing is that the action looks confusing right now, as the name of the class is almost the name of what we call underneath it. The only main difference in the naming is the ig at the name of the action class 🤔

Is there a way we can improve it somehow?

pr-watson · 2024-08-05T14:08:02Z

Looks good to me.

The only thing is that the action looks confusing right now, as the name of the class is almost the name of what we call underneath it. The only main difference in the naming is the ig at the name of the action class 🤔

Is there a way we can improve it somehow?

@r0x0d I could extend the name of the action class to PackageManagerConfiguration or maybe ConfigurePkgManager

convert2rhel/actions/conversion/pkg_manager_config.py

convert2rhel/redhatrelease.py

Venefilyn

Some changes necessary

convert2rhel/redhatrelease.py

convert2rhel/unit_tests/redhatrelease_test.py

convert2rhel/actions/conversion/pkg_manager_config.py

convert2rhel/unit_tests/redhatrelease_test.py

r0x0d · 2024-08-13T17:31:35Z

/packit test --labels sanity

convert2rhel/redhatrelease.py

r0x0d

Looks good!

r0x0d · 2024-08-14T02:03:22Z

/packit build

r0x0d · 2024-08-14T12:07:30Z

/packit build

r0x0d · 2024-08-14T12:45:56Z

/packit test --labels sanity

r0x0d · 2024-08-14T13:59:31Z

/packit retest-failed

pr-watson · 2024-08-14T18:35:16Z

Failing int tests are because we have updated the patch file that gets asserted to be yum/dnf based on the pkg manager. Before the patch file that got output was always yum.conf

r0x0d · 2024-08-14T18:57:59Z

/packit test --labels sanity

hosekadam

Just needs to be rebased

changes addressed

Co-authored-by: Adam Hošek <hosek.adam@outlook.com>

for more information, see https://pre-commit.ci

Co-authored-by: Freya Gustavsson <freya@spytec.se> Co-authored-by: Rodolfo Olivieri <rodolfo.olivieri3@gmail.com>

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

kokesak · 2024-08-16T08:55:12Z

tests/integration/tier1/destructive/changed-yum-conf/test_patch_yum_conf.py

@@ -9,6 +9,9 @@ def test_yum_conf_patch(convert2rhel, shell):
    expanding the $releasever variable properly.
    """
    shell("echo '#random text' >> /etc/yum.conf")


This shell command should be placed little down, once we know which config we want to edit (either the dnf or yum conf)

It doesn't need to since, /etc/yum.conf is either a config file or a symlink to /etc/dnf/dnf.conf
A comment would be nice though

I see, thanks for the info. I haven't realized this. And +1 for the comment

pr-watson added kind/feature New feature or request tests/sanity PR ready to run the sanity test suit. Equivalent to `/packit test --labels sanity`. labels Jul 24, 2024

pr-watson force-pushed the migrate-post-conversion-yum-conf branch from 345be37 to 0fd5623 Compare July 24, 2024 14:59

github-advanced-security bot found potential problems Jul 24, 2024

View reviewed changes

convert2rhel/unit_tests/actions/conversion/pkg_manager_config_test.py Fixed Show resolved Hide resolved

convert2rhel/actions/conversion/pkg_manager_config.py Fixed Show fixed Hide fixed

hosekadam reviewed Jul 29, 2024

View reviewed changes

convert2rhel/redhatrelease.py Outdated Show resolved Hide resolved

hosekadam reviewed Jul 29, 2024

View reviewed changes

convert2rhel/redhatrelease.py Outdated Show resolved Hide resolved

hosekadam reviewed Jul 29, 2024

View reviewed changes

convert2rhel/redhatrelease.py Outdated Show resolved Hide resolved

github-advanced-security bot found potential problems Jul 30, 2024

View reviewed changes

convert2rhel/redhatrelease.py Fixed Show fixed Hide fixed

Venefilyn assigned hosekadam Jul 31, 2024

r0x0d reviewed Aug 5, 2024

View reviewed changes

pr-watson mentioned this pull request Aug 6, 2024

Post Conversion Action Framework merge order #1331

Closed

13 tasks

Venefilyn requested changes Aug 8, 2024

View reviewed changes

convert2rhel/actions/conversion/pkg_manager_config.py Outdated Show resolved Hide resolved

convert2rhel/redhatrelease.py Outdated Show resolved Hide resolved

Venefilyn requested changes Aug 8, 2024

View reviewed changes

Venefilyn previously requested changes Aug 8, 2024

View reviewed changes

convert2rhel/redhatrelease.py Outdated Show resolved Hide resolved

pr-watson requested a review from a team as a code owner August 8, 2024 14:44

pr-watson requested review from Venefilyn and hosekadam August 12, 2024 13:12

Venefilyn reviewed Aug 12, 2024

View reviewed changes

convert2rhel/unit_tests/redhatrelease_test.py Outdated Show resolved Hide resolved

convert2rhel/actions/conversion/pkg_manager_config.py Outdated Show resolved Hide resolved

hosekadam reviewed Aug 12, 2024

View reviewed changes

convert2rhel/actions/conversion/pkg_manager_config.py Show resolved Hide resolved

pr-watson force-pushed the migrate-post-conversion-yum-conf branch from ba6275b to 728a723 Compare August 12, 2024 15:34

pr-watson requested review from r0x0d and hosekadam August 12, 2024 15:34

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

View reviewed changes

convert2rhel/unit_tests/redhatrelease_test.py Fixed Show fixed Hide fixed

r0x0d force-pushed the migrate-post-conversion-yum-conf branch from eb03a7b to 2538ea6 Compare August 13, 2024 17:33

r0x0d reviewed Aug 13, 2024

View reviewed changes

convert2rhel/redhatrelease.py Outdated Show resolved Hide resolved

r0x0d approved these changes Aug 13, 2024

View reviewed changes

r0x0d requested a review from a team as a code owner August 14, 2024 18:43

r0x0d requested a review from danmyway August 14, 2024 18:43

hosekadam approved these changes Aug 15, 2024

View reviewed changes

pr-watson and others added 14 commits August 15, 2024 11:55

[RHELC-1332] Port PkgManagerConf() to the Action framework

76d9ff3

Add pkg manager config and unit test

7adbb3a

Apply suggestions from code review

e23b65c

Co-authored-by: Adam Hošek <hosek.adam@outlook.com>

[pre-commit.ci] auto fixes from pre-commit.com hooks

4de5840

for more information, see https://pre-commit.ci

Draft PkgManagerConf changes

a22be32

Updated PkgManagerConfig structure to use instance variable

690739f

Apply suggestions from code review

c3e53b3

Co-authored-by: Freya Gustavsson <freya@spytec.se> Co-authored-by: Rodolfo Olivieri <rodolfo.olivieri3@gmail.com>

Update class name

5bf606e

Add dependency

caaf6a8

Add mocks for write_altered_pkg_manager_conf

acb1372

Remove PosixPath from unit test

6541ce5

Remove sys import

6e962a6

Update convert2rhel/redhatrelease.py

c3c1780

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

Fix changed-yum int test.

c0b3908

pr-watson force-pushed the migrate-post-conversion-yum-conf branch from ede4a52 to c0b3908 Compare August 15, 2024 15:55

danmyway approved these changes Aug 15, 2024

View reviewed changes

pr-watson merged commit 7c12aa8 into oamg:main Aug 15, 2024
17 of 18 checks passed

kokesak reviewed Aug 16, 2024

View reviewed changes

This was referenced Aug 21, 2024

Bump to version 2.1.0 #1352

Merged

Bump to version 2.1.0 #1356

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RHELC-1332] Port PkgManagerConf() to the Action framework #1321

[RHELC-1332] Port PkgManagerConf() to the Action framework #1321

pr-watson commented Jul 24, 2024 •

edited

Loading

has-bot commented Jul 24, 2024

codecov bot commented Jul 24, 2024 •

edited

Loading

r0x0d left a comment

pr-watson commented Aug 5, 2024 •

edited

Loading

Venefilyn left a comment

r0x0d commented Aug 13, 2024

r0x0d left a comment

r0x0d commented Aug 14, 2024

r0x0d commented Aug 14, 2024

r0x0d commented Aug 14, 2024

r0x0d commented Aug 14, 2024

pr-watson commented Aug 14, 2024

r0x0d commented Aug 14, 2024

hosekadam left a comment

kokesak Aug 16, 2024

danmyway Aug 16, 2024

kokesak Aug 16, 2024

[RHELC-1332] Port PkgManagerConf() to the Action framework #1321

[RHELC-1332] Port PkgManagerConf() to the Action framework #1321

Conversation

pr-watson commented Jul 24, 2024 • edited Loading

has-bot commented Jul 24, 2024

codecov bot commented Jul 24, 2024 • edited Loading

Codecov Report

r0x0d left a comment

Choose a reason for hiding this comment

pr-watson commented Aug 5, 2024 • edited Loading

Venefilyn left a comment

Choose a reason for hiding this comment

r0x0d commented Aug 13, 2024

r0x0d left a comment

Choose a reason for hiding this comment

r0x0d commented Aug 14, 2024

r0x0d commented Aug 14, 2024

r0x0d commented Aug 14, 2024

r0x0d commented Aug 14, 2024

pr-watson commented Aug 14, 2024

r0x0d commented Aug 14, 2024

hosekadam left a comment

Choose a reason for hiding this comment

kokesak Aug 16, 2024

Choose a reason for hiding this comment

danmyway Aug 16, 2024

Choose a reason for hiding this comment

kokesak Aug 16, 2024

Choose a reason for hiding this comment

pr-watson commented Jul 24, 2024 •

edited

Loading

codecov bot commented Jul 24, 2024 •

edited

Loading

pr-watson commented Aug 5, 2024 •

edited

Loading