Skip to content

UnixPB: Add Weston support to RHEL/CentOS 10#3897

Merged
sxa merged 10 commits intoadoptium:masterfrom
aswinkr77:weyland-server
Mar 10, 2025
Merged

UnixPB: Add Weston support to RHEL/CentOS 10#3897
sxa merged 10 commits intoadoptium:masterfrom
aswinkr77:weyland-server

Conversation

@aswinkr77
Copy link
Contributor

@aswinkr77 aswinkr77 commented Mar 4, 2025

rel: #3851

The task installs weston related packages in RedHat/CentOS 10

Checklist

Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

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

Thank you for this PR :-)
One concern though - in addition to my command about the naming, do the rest of the playbooks run through ok on RHEL10? I'd expect it to have problems with some of the X11 packages which are already in the playbooks.

@aswinkr77
Copy link
Contributor Author

in addition to my command about the naming

I can't see your review about the naming.

I'd expect it to have problems with some of the X11 packages which are already in the playbooks.

That's right. I completely missed that part.

@sxa
Copy link
Member

sxa commented Mar 4, 2025

in addition to my command about the naming

I can't see your review about the naming.

Sorry - looks like that command didn't save properly. It was relating to Additional_Test_Tool_Packages_RHEL10. Since this is not specific to RHEL10 (as a miniumum it woulkd be applicable to RHEL11 and later versions when they come out) we shouldn't name this RHEL10 specifically. I would suggest Additional_Test_Tool_Packages_Wayland (or maybe Weston in place of Wayland but it's possible we'll use a different solution for Wayland in the future so I think having Wayland in the name is clearer.

I'd expect it to have problems with some of the X11 packages which are already in the playbooks.

That's right. I completely missed that part.

Since I don't have any EL10 systems at the moment it would be good for you to run the playbooks with this patch on a 'clean' RHEL10 system and verify that they run through ok. It's possible that some other parts of the playbooks will have issues since we've never tested on there.

@aswinkr77
Copy link
Contributor Author

@sxa I've made the necessary changes.

@sxa sxa moved this to In Progress in 2025 Adoptium Plan Mar 5, 2025
@sxa sxa added this to the 2025-03 (March) milestone Mar 5, 2025
@sxa
Copy link
Member

sxa commented Mar 5, 2025

I have started a run of VagrantPlaybookCheck to verify that this is still ok with the earlier versions of CentOS: (Link in the initial description)

@sxa
Copy link
Member

sxa commented Mar 5, 2025

I'm not entirely sure why yet but the previous playbook runs (before this PR) have:

17:28:14 changed: [localhost] => (item=xorg-x11-server-Xvfb)

But the one tested with your PR has:

15:35:07 TASK [Common : Install xorg-x11-server-Xvfb (< CentOS10)] **********************
15:35:08 skipping: [127.0.0.1]
15:35:08 
15:35:08 TASK [Common : Install Wayland related packages (>= CentOS10)] *****************
15:35:09 skipping: [127.0.0.1] => (item=weston) 
15:35:09 skipping: [127.0.0.1] => (item=wayland-utils) 
15:35:09 skipping: [127.0.0.1] => (item=xorg-x11-server-Xwayland) 
15:35:10 skipping: [127.0.0.1]

It's not immediately obvious why this is has been "skipped" but it may be something related to the conditionals which we'll need to understand before merging IMHO.

@aswinkr77
Copy link
Contributor Author

Fixed it. It was due to string comparison. Changed to integer comparison.

@aswinkr77
Copy link
Contributor Author

All looks good in github workflow for CentOS 6:

#10 526.7 TASK [Common : Install xorg-x11-server-Xvfb (< CentOS10)] **********************
#10 530.5 changed: [localhost]
#10 530.5 
#10 530.5 TASK [Common : Install Wayland related packages (>= CentOS10)] *****************
#10 530.6 skipping: [localhost] => (item=weston) 
#10 530.6 skipping: [localhost] => (item=wayland-utils) 
#10 530.6 skipping: [localhost] => (item=xorg-x11-server-Xwayland) 

@sxa
Copy link
Member

sxa commented Mar 6, 2025

I'll run it through another test to check then we should be good to merge 👍🏻
https://ci.adoptium.net/view/Tooling/job/VagrantPlaybookCheck/2077/

@aswinkr77
Copy link
Contributor Author

@sxa could you rerun the vagrant on centos, they all failed due to the same issue. But it installed the x11 package and skipped the wayland packages in CentOS 8 before it failed at a later stage:

17:51:31 TASK [Common : Install xorg-x11-server-Xvfb (< CentOS10)] **********************
17:51:32 changed: [127.0.0.1]
17:51:32 
17:51:32 TASK [Common : Install Wayland related packages (>= CentOS10)] *****************
17:51:32 skipping: [127.0.0.1] => (item=weston) 
17:51:32 skipping: [127.0.0.1] => (item=wayland-utils) 
17:51:32 skipping: [127.0.0.1] => (item=xorg-x11-server-Xwayland) 
17:51:33 skipping: [127.0.0.1]

@sxa
Copy link
Member

sxa commented Mar 8, 2025

@sxa could you rerun the vagrant on centos, they all failed due to the same issue. But it installed the x11 package and skipped the wayland packages in CentOS 8 before it failed at a later stage:

Yep I'm happy with that :-)

@sxa sxa requested review from Haroon-Khel and steelhead31 March 8, 2025 10:21
Copy link
Contributor

@steelhead31 steelhead31 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

@sxa sxa merged commit c606cb5 into adoptium:master Mar 10, 2025
12 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in 2025 Adoptium Plan Mar 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

3 participants