Add conditionals for Rhel9 in common role #3802

AswathySK · 2024-11-06T11:45:55Z

The common role for Unix playbook doesnt include conditionals for rhel9 causing playbook failures.

Failures caused due to current condition:

EPEL release not enabled for rhel9
packags included in Installing additional build tools if NOT RHEL 8 task is applicable for rhel9 as well. For example NTP is replaced by chronyd.
Additional build tools for rhel 8 is also required by rhel 9

Checklist

commit message has one of the standard prefixes
faq.md updated if appropriate
other documentation is changed or added (if applicable)
playbook changes run through VPC or QPC (if you have access)
VPC/QPC not applicable for this PR
for inventory.yml changes, bastillion/nagios/jenkins updated accordingly

AdamBrousseau

@AswathySK can we make these conditions smarter so we don't have to keep updating them every time a new OS is released? Or do we prefer to leave it like this so we can test the new major OS releases?

AswathySK · 2024-11-07T20:08:44Z

@AdamBrousseau instead of changing conditional to do it for everything greater than or equal to rhel 8 instead?
There could be change in package dependencies for the future releases.
So how to make the change right now is up to the community I suppose.

AdamBrousseau · 2024-11-08T13:46:14Z

Sure. We can get other opinions. If we change it to be something like >=, and it stops working, the PBs will presumably fail and someone can investigate at that point. That would have to happen either way, but at least this way, you don't have to monitor and update it when it works.

AdamBrousseau · 2024-11-11T21:39:30Z

@sxa do you have an opinion on the above?

AswathySK · 2024-11-12T06:17:13Z

@AdamBrousseau , I have made the change as per your suggestion.

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml

AdamBrousseau · 2024-11-12T16:43:39Z

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml

  package: "name={{ item }} state=latest"
  with_items: "{{ Java_RHEL8 }}"
-  when: (ansible_distribution_major_version == "8")
+  when: (ansible_distribution_major_version | int >= 8)


Are these 3 cases still what we want?
From

infrastructure/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml

Line 95 in 894d848

Java_RHEL8:

Java_RHEL8: - java-1.8.0-openjdk-devel Java_NOT_RHEL6_PPC64: # Not RHEL8 either - java-1.7.0-openjdk-devel - java-1.8.0-openjdk-devel Java_RHEL6_PPC64: - java-1.7.0-ibm-devel - java-1.8.0-ibm-devel

What is java 7 and 8 used for?

@AdamBrousseau @sxa , I am not sure. Should we bump it to 17 or 21?

As far as I can tell it's been there since the beginning. Java is needed for 2 purposes that I know of.

Connecting agents to jenkins.

Bootjdk for compiling java.

Since Jenkins now requires jdk17 to run agents, and jdk11 was required 2 years ago, I don't think leaving this at java8 for jenkins connections is necessary.
For bootjdk requirement, the build scripts will pull the needed jdk during the build process so having a permanent install of 8 is not necessary in my opinion.

I would want an opinion from Adopt/@sxa before we remove it completely though.

As far as the boot JDK is concerned I don't want the builds pulling it down dynamically in most cases - that's mostly just a fallback mechanism. Other than pulling down the source, the builds should be able to run without network access.

I suspect those java-1.8.0* packages are no longer required, at least by Temurin, so it would likely be safe to remove them.

@AdamBrousseau , @sxa ,
Since stewart is of opinion not to pull down the bootjdks by the jobs.And java8 is not required, Should we remove the installing and setting up default java part in this role or should we maybe bump it to jdk17 or 21?

Yes I think that should be safe. It will hopefully be obvious if some part of the process requires it, in which case it's easy to back it out again :-)

Can the 1.7 version be installed from the RHEL9 repositories?

@sxa is there another part of the PB installing java for use by the jenkins agent that Adopt is running?
We have an internal Semeru role that installs 21 for this.

Yep. The adoptopenjdk_install role: .

infrastructure/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml

Line 131 in 028773c

- role: adoptopenjdk_install # JDK21 Build Bootstrap

It's extracting as a tarball and doesn't set any default on the system to point to it, so the Jenkins agent is pointed directly to it under /usr/lub/jvm when it's started

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml

Signed-off-by: Aswathy S Kumar <aswathyskumar144@gmail.com>

karianna · 2024-12-05T06:58:14Z

@AswathySK Linter failures as well

sxa

A few comments/suggestions in addition to the Java7 on RHEL9 comments above.
Should any of these changes be made in the CentOS files too?

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml

sxa · 2024-12-05T12:17:27Z

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml

  package: "name={{ item }} state=latest"
-  with_items: "{{ Additional_Build_Tools_NOT_RHEL8 }}"
+  with_items: "{{ Additional_Build_Tools_NOT_RHEL8Plus }}"


We probably need to go through and sanitise some of these names. This one should probably be Additional_Build_Tools_RHEL6_RHEL7 now but that doesn't need to be changed in this PR

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml

sxa · 2024-12-05T12:20:04Z

ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/RedHat.yml

@@ -92,17 +92,6 @@ Additional_Build_Tools_RHEL7_s390x:
  - libstdc++.s390                # a dependency required for executing a 32-bit C binary
  - yum-utils                     # yumdownloader required for devkit creation

-Java_RHEL8:


Since we still have the reference to Java_RHEL8 above I believe this should not be removed

sxa · 2025-01-15T11:49:19Z

New VPC run at https://ci.adoptium.net/view/Tooling/job/VagrantPlaybookCheck/2038/ (Expect at least CentOS6 to fail - unrelated to this PR)

karianna · 2025-01-15T20:12:35Z

@AswathySK merge conflicts.

github-actions

A block has been put on this Pull Request as this repository is temporarily under a code freeze due to an ongoing release cycle.

If this pull request needs to be merged during the release cycle then please comment /merge and a PMC member will be able to remove the block.

If the code freeze is over you can remove this block by commenting /thaw.

AswathySK · 2025-01-21T07:13:42Z

@karianna @sxa ,
should this merge wait until code freeze is over?

karianna · 2025-01-22T00:30:36Z

Yes and I'd love to see the CEntOS6 and Solaris GH actions start passing again, but I suspect that's a separate issue

AswathySK · 2025-01-28T07:09:04Z

@karianna ,
when will the code freeze be over?

karianna · 2025-01-28T07:29:09Z

Not sure, should be by end of this week at the latest though

sxa · 2025-02-04T12:56:21Z

Looks like it was done during my time away at FOSDEM :-)
adoptium/.github#193
Currently catching up with notifications ...

AswathySK · 2025-02-04T19:42:53Z

@sxa @karianna ,
Can this be merged then as the code freeze is over?

karianna · 2025-02-05T02:42:06Z

/merge

karianna · 2025-02-05T02:50:55Z

Hmm, I think it actually wants the two failing GH Actions to pass (although I realize they're not related)

sxa · 2025-02-05T15:33:53Z

@AswathySK Have you confirmed that a system installed with these playbooks is capable of building and testing openjdk? When I tried to run a temurin build in a CentOS Stream 9 (Should be equivalent to RHEL9) containers configured with these changes it was still missing some things like diffutils.

[EDIT: diffutils and procps-ng are not included with the default containers for Stream 9 and later, so I've created an issue to get those added]

sxa · 2025-02-05T15:35:40Z

Hmm, I think it actually wants the two failing GH Actions to pass (although I realize they're not related)

I'd be happy to dismiss the bots review for the purposes of getting this through when we agree it's ready.

sxa · 2025-02-05T15:36:40Z

Side note: It looks like the playbooks are not happy running under the version of ansible that ships with CentOS Stream 10 (and presumably true for the upcoming RHEL10 release), but that's for the future.

sxa · 2025-02-06T11:11:50Z

/thaw

Pull Request unblocked - code freeze is over.

sxa

From the limited testing I can do just now this looks good I think. Needs a second reviewer then we can get it in.

sxa · 2025-02-06T17:55:13Z

@AswathySK Did you manage to get this working on RHEL9 given that the curl installation that the playbooks do would confict with curl-minimal which is there by default?

[EDIT: I've included a change in https://github.com//pull/3870/commits/9ce073d93fcbca837b57d66117c70790f08d068f to compensate for this]

github-actions bot added the ansible label Nov 6, 2024

AdamBrousseau reviewed Nov 7, 2024

View reviewed changes

karianna requested a review from AdamBrousseau November 11, 2024 21:38

AswathySK force-pushed the rhel9-conditionals branch 2 times, most recently from d831534 to e9ee426 Compare November 12, 2024 06:16

AdamBrousseau suggested changes Nov 12, 2024

View reviewed changes

AswathySK force-pushed the rhel9-conditionals branch from e9ee426 to 5586db8 Compare November 22, 2024 10:09

karianna requested a review from sxa November 25, 2024 21:33

AswathySK added 2 commits December 3, 2024 00:33

Add conditionals for Rhel9 in common role

307ef6f

Signed-off-by: Aswathy S Kumar <aswathyskumar144@gmail.com>

Add conditionals for Rhel9 in common role

885e859

Signed-off-by: Aswathy S Kumar <aswathyskumar144@gmail.com>

AswathySK force-pushed the rhel9-conditionals branch from 1539331 to 885e859 Compare December 2, 2024 19:03

karianna requested a review from AdamBrousseau December 3, 2024 06:53

sxa reviewed Dec 5, 2024

View reviewed changes

AswathySK added 2 commits January 14, 2025 19:44

change

a017ee6

change

9d879c2

karianna requested a review from sxa January 15, 2025 01:35

Merge branch 'master' into rhel9-conditionals

a9fa00c

github-actions bot previously requested changes Jan 21, 2025

View reviewed changes

Merge branch 'master' into rhel9-conditionals

0888767

sxa mentioned this pull request Feb 6, 2025

unixPB: add diffutils and procps-ng to RH/Cent/Fedora #3870

Open

6 tasks

sxa approved these changes Feb 6, 2025

View reviewed changes

sxa requested review from Haroon-Khel, karianna and AdamBrousseau and removed request for AdamBrousseau February 6, 2025 11:43

sxa mentioned this pull request Feb 20, 2025

Ansible request for curl on CentOS Stream9 #3871

Open

Add conditionals for Rhel9 in common role #3802

Are you sure you want to change the base?

Add conditionals for Rhel9 in common role #3802

Conversation

AswathySK commented Nov 6, 2024

Checklist

AdamBrousseau left a comment

Choose a reason for hiding this comment

AswathySK commented Nov 7, 2024

AdamBrousseau commented Nov 8, 2024

AdamBrousseau commented Nov 11, 2024

AswathySK commented Nov 12, 2024

Choose a reason for hiding this comment

AswathySK Nov 12, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

karianna commented Dec 5, 2024

sxa left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sxa Dec 5, 2024 • edited Loading

Choose a reason for hiding this comment

sxa commented Jan 15, 2025

karianna commented Jan 15, 2025

github-actions bot left a comment

Choose a reason for hiding this comment

AswathySK commented Jan 21, 2025

karianna commented Jan 22, 2025

AswathySK commented Jan 28, 2025

karianna commented Jan 28, 2025

sxa commented Feb 4, 2025

AswathySK commented Feb 4, 2025

karianna commented Feb 5, 2025

karianna commented Feb 5, 2025

sxa commented Feb 5, 2025 • edited Loading

sxa commented Feb 5, 2025

sxa commented Feb 5, 2025

sxa commented Feb 6, 2025

sxa left a comment

Choose a reason for hiding this comment

sxa commented Feb 6, 2025 • edited Loading

AswathySK Nov 12, 2024 •

edited

Loading

sxa left a comment •

edited

Loading

sxa Dec 5, 2024 •

edited

Loading

sxa commented Feb 5, 2025 •

edited

Loading

sxa commented Feb 6, 2025 •

edited

Loading