Skip to content
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-878] Remove 8.4 from supported EUS versions #808

Merged
merged 5 commits into from
Jun 6, 2023

Conversation

pr-watson
Copy link
Contributor

@pr-watson pr-watson commented Apr 12, 2023

This PR removes the CentOS 8.4 EUS repos and their links to integration tests

Jira Issues: RHELC-878

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

@pr-watson
Copy link
Contributor Author

@danmyway since this PR removes RHEL 8.4 repos I believe the integration test for centos-8.4 need to be updated to use centos-8.6.

@codecov
Copy link

codecov bot commented Apr 13, 2023

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (2aa5c04) 94.01% compared to head (83a50bc) 94.01%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #808   +/-   ##
=======================================
  Coverage   94.01%   94.01%           
=======================================
  Files          40       40           
  Lines        3808     3808           
  Branches      678      678           
=======================================
  Hits         3580     3580           
  Misses        162      162           
  Partials       66       66           
Flag Coverage Δ
centos-linux-7 88.97% <100.00%> (ø)
centos-linux-8 89.60% <100.00%> (ø)

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

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

... and 1 file with indirect coverage changes

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

@r0x0d
Copy link
Member

r0x0d commented Apr 18, 2023

@pr-watson, I think you can drop the 8.4 versions from packit too. @danmyway, do you agree?

@danmyway
Copy link
Member

@pr-watson, I think you can drop the 8.4 versions from packit too. @danmyway, do you agree?

I agree with dropping it from the config.
However, I have a question about a timeline for this PR - will this get merged ASAP?
Are we dropping the upstream verifications for 8.4 right now?
I suppose we won't do regression testing for the 1.3 given the RHEL 8.4 goes of out of Extended Update Support (EUS) by the time of the release.
But IMO keeping the 8.4 verifications live until May, 31st seems reasonable to me.
Again, remove it from the config in this PR at your will, I am not opposed to that at all.
Thoughts @SpyTec @bocekm ?

@pr-watson
Copy link
Contributor Author

@pr-watson, I think you can drop the 8.4 versions from packit too. @danmyway, do you agree?

I agree with dropping it from the config. However, I have a question about a timeline for this PR - will this get merged ASAP? Are we dropping the upstream verifications for 8.4 right now? I suppose we won't do regression testing for the 1.3 given the RHEL 8.4 goes of out of Extended Update Support (EUS) by the time of the release. But IMO keeping the 8.4 verifications live until May, 31st seems reasonable to me. Again, remove it from the config in this PR at your will, I am not opposed to that at all. Thoughts @SpyTec @bocekm ?

My PR for removing the 8.4 repos from Dogfood servers has been postponed for merging till May 31, 2023, so I assume the same would apply for this PR.

@Venefilyn
Copy link
Member

For dogfood servers it makes sense as we want to be able to test against it until last second. However, I don't think we need to block this pr. We have the release branch if we need to release something urgently

Packit is also related to testing so I'd want to keep that for now, at least until we drop support for 8.4. But I assume that would cause issues for all PRs right?

@danmyway
Copy link
Member

For dogfood servers it makes sense as we want to be able to test against it until last second. However, I don't think we need to block this pr. We have the release branch if we need to release
something urgently

Packit is also related to testing so I'd want to keep that for now, at least until we drop support for 8.4. But I assume that would cause issues for all PRs right?

If we would merge this PR, we need to remove the 8.4 from Packit config, otherwise most of the CentOS 8.4 pipeline will fail as you say @SpyTec.
So in case we want to drop the upstream verifications now, let me know and I will also remove all the 8.4 related code from tests.

@Venefilyn
Copy link
Member

Venefilyn commented Apr 18, 2023

If we would merge this PR, we need to remove the 8.4 from Packit config, otherwise most of the CentOS 8.4 pipeline will fail as you say

That's what I feared. Then we should wait with this PR too and do Packit together with this PR

@danmyway danmyway self-assigned this Apr 19, 2023
@danmyway
Copy link
Member

That's what I feared. Then we should wait with this PR too and do Packit together with this PR

Cool, thank you for the clarification.
I can take care of it @pr-watson, and I will also remove the 8.4 related test code.

@pr-watson
Copy link
Contributor Author

That's what I feared. Then we should wait with this PR too and do Packit together with this PR

Cool, thank you for the clarification. I can take care of it @pr-watson, and I will also remove the 8.4 related test code.

Thanks @danmyway!

@r0x0d
Copy link
Member

r0x0d commented Apr 25, 2023

There is a PR that removes the 8.4 support from our internal vagrant workflow. The PR will be merged once this one is merged, so, this is a future warning for myself.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey, @pr-watson, I will revert changes in this file.
We need to add and enable the 8.4 repos, because we are looking for a package, which is not present in 8.5 repos anymore.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@danmyway understood

plans/tier1.fmf Outdated Show resolved Hide resolved
@danmyway
Copy link
Member

danmyway commented May 2, 2023

I have rebased and modified the tests @pr-watson

@Venefilyn Venefilyn added the kind/feature New feature or request label May 2, 2023
@danmyway danmyway force-pushed the remove-8.4 branch 3 times, most recently from a8cf6e3 to 9bc1641 Compare May 10, 2023 09:52
Copy link
Member

@kokesak kokesak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one small thing in the comment. Otherwise, the QE side looks good!

Copy link
Member

@r0x0d r0x0d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just minor comments, but otherwise, it is looking good!

convert2rhel/unit_tests/conftest.py Outdated Show resolved Hide resolved
convert2rhel/unit_tests/conftest.py Outdated Show resolved Hide resolved
convert2rhel/unit_tests/repo_test.py Outdated Show resolved Hide resolved
convert2rhel/unit_tests/systeminfo_test.py Outdated Show resolved Hide resolved
@pr-watson
Copy link
Contributor Author

@r0x0d thanks for the suggestions

@r0x0d
Copy link
Member

r0x0d commented May 22, 2023

This needs a rebase @pr-watson.

@danmyway
Copy link
Member

danmyway commented Jun 6, 2023

Rebased, conflicts resolved, ready to merge

r0x0d
r0x0d previously approved these changes Jun 6, 2023
pr-watson and others added 3 commits June 6, 2023 11:59
* remove all 8.4 related code

Signed-off-by: Daniel Diblik <ddiblik@redhat.com>
Signed-off-by: Daniel Diblik <ddiblik@redhat.com>
Copy link
Member

@r0x0d r0x0d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

Co-authored-by: Rodolfo Olivieri <rodolfo.olivieri3@gmail.com>
@pr-watson pr-watson merged commit 6103236 into oamg:main Jun 6, 2023
Venefilyn pushed a commit that referenced this pull request Jun 19, 2023
* [RHELC-878] Remove 8.4 from supported EUS versions

* Modify tests

* remove all 8.4 related code

Signed-off-by: Daniel Diblik <ddiblik@redhat.com>

* Address review comments

Signed-off-by: Daniel Diblik <ddiblik@redhat.com>

* Apply suggestions from code review

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

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

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

---------

Signed-off-by: Daniel Diblik <ddiblik@redhat.com>
Co-authored-by: Daniel Diblik <ddiblik@redhat.com>
Co-authored-by: Rodolfo Olivieri <rodolfo.olivieri3@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@bocekm bocekm mentioned this pull request Aug 28, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants