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

test: Move TestMultiOSDirect from centos-8-stream to rhel-8-10, drop CentOS 8 special cases #20440

Merged
merged 2 commits into from
May 7, 2024

Conversation

martinpitt
Copy link
Member

I accidentally broke main with cockpit-project/bots#6348 , sorry about that!

CentOS 8 is EOL, we have stopped running c8s tests on cockpit main long
ago, and the image got removed in
cockpit-project/bots#6348
Copy link
Member

@allisonkarlitskaya allisonkarlitskaya left a comment

Choose a reason for hiding this comment

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

👍 thanks!

@@ -30,7 +30,7 @@ class TestWireGuard(packagelib.PackageCase, netlib.NetworkCase):
b.wait_visible("#network-wireguard-settings-dialog")
iface_name = b.val("#network-wireguard-settings-interface-name-input")
b.wait_visible("#network-wireguard-settings-save:disabled")
if m1.image in ["rhel4edge", "centos-8-stream"] or m1.image.startswith("rhel-8"):
if m1.image in ["rhel4edge"] or m1.image.startswith("rhel-8"):
Copy link
Member

Choose a reason for hiding this comment

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

I've seen ruff complain about stuff like this before...

Copy link
Member Author

Choose a reason for hiding this comment

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

OOI, what about?

Copy link
Member

Choose a reason for hiding this comment

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

Using in with a single-item list (ie: please change this to an equality compare).

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah! Can I say "let's use this as a reminder to kill it off completely"? 😁 At some point rhel4edge ought to catch up with RHEL 9.4 (it was just released in fact, so we should soon get a 9.4 based image).

@@ -85,11 +85,11 @@ class TestRHEL8(testlib.MachineCase):
class TestMultiOSDirect(testlib.MachineCase):
provision = {
"0": {"address": "10.111.113.1/20", "memory_mb": 512},
"stock": {"address": "10.111.113.5/20", "image": "centos-8-stream", "memory_mb": 512}
Copy link
Member

Choose a reason for hiding this comment

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

bzzt bzzt oops :)

@martinpitt martinpitt merged commit e4ae43f into cockpit-project:main May 7, 2024
75 of 82 checks passed
@martinpitt martinpitt deleted the no-c8 branch May 7, 2024 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-blocker Targetted for next release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants