[RHELC-738] Add RHEL 8.6 among the supported EUS minor versions #607

bocekm · 2022-09-13T20:52:20Z

When RHEL 8.7 is released, RHEL 8.6 will transition into the Extended Update Support. Our next release will happen post RHEL 8.7 GA so this is to make sure we then correctly detect 8.6 as EUS.

Some integration may be failing now as:

they don't expect 8.6 to be EUS
different RHEL repos are being enabled
some checks during the conversion are being skipped if converting to EUS, namely loaded kernel currency check and system up-to-date check on Oracle Linux (because Oracle does not make repos of older minor versions available)
the convert2rhel will start locking to the minor version through RHSM

Jira Issue: RHELC-738

Checklist

PR meets acceptance criteria specified in the Jira issue
PR has been tested manually in a VM (either author or reviewer)
Jira issue has been made public if possible
[RHELC-738] is part of the PR title
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

github-actions · 2022-09-13T20:52:31Z

Thank you for contributing to the Convert2RHEL project!

👋 Hello @bocekm, thank you for submitting a PR 🚀!
Please note that every PR needs to comply with the Convert2RHEL Guidelines and must pass all tests in order to be mergable.
If you want to rebuild a package in Fedora Copr, you can use the following command as a comment:

/packit copr-build to trigger a copr build using packit

To execute integration tests, members of the oamg organization don't need any extra step. The automation kicks that off for you!

If you're an external collaborator (meaning that you're not part of the oamg organization), wait for somebody from the @oamg/convert2rhel-developers group to add the testing label to the PR to trigger the tests.

Note: In case there are problems with tests not being triggered automatically for a new PR/commit or pending for a long time, ping @oamg/convert2rhel-developers in a PR comment.

codecov · 2022-09-13T20:54:08Z

Codecov Report

Base: 93.35% // Head: 93.35% // No change to project coverage 👍

Coverage data is based on head (f98536f) compared to base (87fa1f3).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #607   +/-   ##
=======================================
  Coverage   93.35%   93.35%           
=======================================
  Files          22       22           
  Lines        3147     3147           
  Branches      559      559           
=======================================
  Hits         2938     2938           
  Misses        147      147           
  Partials       62       62

Flag	Coverage Δ
centos-linux-6	`89.86% <100.00%> (ø)`
centos-linux-7	`89.33% <100.00%> (ø)`
centos-linux-8	`89.52% <100.00%> (ø)`

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

Impacted Files	Coverage Δ
convert2rhel/systeminfo.py	`96.65% <100.00%> (ø)`

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

bocekm · 2022-10-27T21:42:26Z

/packit build

r0x0d · 2022-10-31T15:57:55Z

@bocekm are you expecting this to be present on the next release (1.1) or for the 1.2?

bocekm · 2022-10-31T16:38:56Z

@r0x0d, 1.1 as indicated in RHELC-738. Without this change conversions from OL 8.6 to RHEL 8.6 EUS wouldn't be possible.

r0x0d · 2022-10-31T18:36:20Z

Rebased as some integration tests were failing because of the mismatch in packit between main/pr branch.

r0x0d · 2022-11-04T18:43:35Z

tests/integration/tier0/backup-release/test_backup_release.py

@@ -29,7 +29,7 @@ def test_backup_os_release_no_envar(shell, convert2rhel):
    assert shell("mv /etc/yum.repos.d/* /tmp/s_backup/").returncode == 0

    # EUS version use hardoced repos from c2r as well
-    if "centos-8" in system or "oracle-8.4" in system:
+    if "centos-8" in system:


Oracle Linux doesn't have any hardcoded repos anymore.

Is this something you're saying needs to change in the PR? Or just explaining why it's removed

Just explaining.

r0x0d · 2022-11-04T18:43:40Z

tests/integration/tier0/backup-release/test_backup_release.py

@@ -79,7 +79,7 @@ def test_backup_os_release_with_envar(shell, convert2rhel):
    # Return repositories to their original location
    assert shell("mv /tmp/s_backup/* /etc/yum.repos.d/").returncode == 0

-    if "centos-8" in system or "oracle-8.4" in system:
+    if "centos-8" in system:


Oracle Linux doesn't have any hardcoded repos anymore.

r0x0d · 2022-11-07T16:32:01Z

I'm hand-picking the changes made in #652 so we can see if the pipeline pass.

When RHEL 8.7 is released, RHEL 8.6 will transition into the Extended Update Support. Our next release will happen post RHEL 8.7 GA so this is to make sure we then correctly detect 8.6 as EUS.

Updated the test to include a check for EUS repositories when the system is converted to RHEL 8.6, as we are introducing it as a EUS conversion. Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

Some tests were left behind in my previous commit regarding the introduction of 8.6 being considered EUS by Convert2RHEL. Now those tests are properly updated. Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

Enable the rhel8-eus-repos playbook to distribution version 8.6 alongside 8.4. Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

Changed the satellite dogfood address from `dogfood.sat.engineering.redhat.com` to `satellite.sat.engineering.redhat.com` Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

Venefilyn

Integration tests passing. Are we OK to merge?

r0x0d · 2022-11-09T14:20:40Z

Integration tests passing. Are we OK to merge?

Totally. Just waiting for the last integration test to finish.

…#607) Co-authored-by: Rodolfo Olivieri <rolivier@redhat.com>

Co-authored-by: Rodolfo Olivieri <rolivier@redhat.com>

Venefilyn previously approved these changes Oct 4, 2022

View reviewed changes

r0x0d previously approved these changes Oct 5, 2022

View reviewed changes

r0x0d dismissed stale reviews from Venefilyn and themself via faa01fb October 31, 2022 18:35

r0x0d force-pushed the add-8.6-to-supported-eus-releases branch from a76bf29 to faa01fb Compare October 31, 2022 18:35

r0x0d mentioned this pull request Nov 1, 2022

[RHELC-645] Skip check of latest kernel on OL8.4 #589

Merged

r0x0d force-pushed the add-8.6-to-supported-eus-releases branch from faa01fb to c03859f Compare November 4, 2022 16:25

r0x0d requested review from Venefilyn and abadger November 4, 2022 16:32

r0x0d reviewed Nov 4, 2022

View reviewed changes

r0x0d force-pushed the add-8.6-to-supported-eus-releases branch from fdc08c6 to d372d31 Compare November 7, 2022 13:53

r0x0d mentioned this pull request Nov 7, 2022

[RHELC-689] Verification test - Latest kernel check: Handle unsuccessful repoquery call #617

Merged

7 tasks

Venefilyn previously approved these changes Nov 7, 2022

View reviewed changes

r0x0d dismissed Venefilyn’s stale review via cd96b5c November 7, 2022 16:31

bocekm and others added 5 commits November 8, 2022 09:07

Add RHEL 8.6 among the supported EUS minor versions

68dd9eb

When RHEL 8.7 is released, RHEL 8.6 will transition into the Extended Update Support. Our next release will happen post RHEL 8.7 GA so this is to make sure we then correctly detect 8.6 as EUS.

Update test_enabled_repositories int test

bf4ab16

Updated the test to include a check for EUS repositories when the system is converted to RHEL 8.6, as we are introducing it as a EUS conversion. Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

Modify couple of integration tests to adapt the OL8.6 EUS

8b150aa

Some tests were left behind in my previous commit regarding the introduction of 8.6 being considered EUS by Convert2RHEL. Now those tests are properly updated. Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

Fix rhel8-eus-repos for OL8.6

9ed792b

Enable the rhel8-eus-repos playbook to distribution version 8.6 alongside 8.4. Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

Change satellite dogfood server address

f98536f

Changed the satellite dogfood address from `dogfood.sat.engineering.redhat.com` to `satellite.sat.engineering.redhat.com` Signed-off-by: Rodolfo Olivieri <rolivier@redhat.com>

r0x0d force-pushed the add-8.6-to-supported-eus-releases branch from cd96b5c to f98536f Compare November 8, 2022 12:10

Venefilyn approved these changes Nov 9, 2022

View reviewed changes

Venefilyn merged commit 7b7fda1 into oamg:main Nov 9, 2022

hosekadam pushed a commit to hosekadam/convert2rhel that referenced this pull request Nov 11, 2022

[RHELC-738] Add RHEL 8.6 among the supported EUS minor versions (oamg…

55947ca

…#607) Co-authored-by: Rodolfo Olivieri <rolivier@redhat.com>

Venefilyn mentioned this pull request Nov 30, 2022

Bump version to 1.1 #675

Merged

abadger pushed a commit to Andrew-ang9/convert2rhel that referenced this pull request Dec 7, 2022

[RHELC-738] Add RHEL 8.6 among the supported EUS minor versions (oamg…

d892635

…#607) Co-authored-by: Rodolfo Olivieri <rolivier@redhat.com>

Venefilyn pushed a commit that referenced this pull request Jun 19, 2023

[RHELC-738] Add RHEL 8.6 among the supported EUS minor versions (#607)

96f22cf

Co-authored-by: Rodolfo Olivieri <rolivier@redhat.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[RHELC-738] Add RHEL 8.6 among the supported EUS minor versions #607

[RHELC-738] Add RHEL 8.6 among the supported EUS minor versions #607

bocekm commented Sep 13, 2022 •

edited

Loading

github-actions bot commented Sep 13, 2022

codecov bot commented Sep 13, 2022 •

edited

Loading

bocekm commented Oct 27, 2022

r0x0d commented Oct 31, 2022

bocekm commented Oct 31, 2022

r0x0d commented Oct 31, 2022

r0x0d Nov 4, 2022

Venefilyn Nov 7, 2022

r0x0d Nov 7, 2022

r0x0d Nov 4, 2022

r0x0d commented Nov 7, 2022

Venefilyn left a comment

r0x0d commented Nov 9, 2022

[RHELC-738] Add RHEL 8.6 among the supported EUS minor versions #607

[RHELC-738] Add RHEL 8.6 among the supported EUS minor versions #607

Conversation

bocekm commented Sep 13, 2022 • edited Loading

github-actions bot commented Sep 13, 2022

Thank you for contributing to the Convert2RHEL project!

codecov bot commented Sep 13, 2022 • edited Loading

Codecov Report

bocekm commented Oct 27, 2022

r0x0d commented Oct 31, 2022

bocekm commented Oct 31, 2022

r0x0d commented Oct 31, 2022

r0x0d Nov 4, 2022

Choose a reason for hiding this comment

Venefilyn Nov 7, 2022

Choose a reason for hiding this comment

r0x0d Nov 7, 2022

Choose a reason for hiding this comment

r0x0d Nov 4, 2022

Choose a reason for hiding this comment

r0x0d commented Nov 7, 2022

Venefilyn left a comment

Choose a reason for hiding this comment

r0x0d commented Nov 9, 2022

bocekm commented Sep 13, 2022 •

edited

Loading

codecov bot commented Sep 13, 2022 •

edited

Loading