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 <[email protected]>

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?

sxa · 2024-12-05T12:16:29Z

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

@@ -52,11 +51,11 @@
 ##########################
 # Additional build tools #
 ##########################
- name: Install additional build tools if NOT RHEL 8
+- name: Install additional build tools if NOT RHEL8 and above 


Remove trailing whitespace to fix linter error

Suggested change

- name: Install additional build tools if NOT RHEL8 and above

- name: Install additional build tools if NOT RHEL8 and above

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

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

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


 - name: Install Java when RedHat 6 on ppc64
  package: "name={{ item }} state=latest"
  with_items: "{{ Java_RHEL6_PPC64 }}"
  when: (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")

- name: Install Java when RedHat 8
+- name: Install Java when RedHat 8 and RedHat 9


Suggested change

- name: Install Java when RedHat 8 and RedHat 9

- name: Install Java when RedHat 8 and later

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

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 <[email protected]>

Add conditionals for Rhel9 in common role

885e859

Signed-off-by: Aswathy S Kumar <[email protected]>

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add conditionals for Rhel9 in common role #3802

Add conditionals for Rhel9 in common role #3802

AswathySK commented Nov 6, 2024

AdamBrousseau left a comment

AswathySK commented Nov 7, 2024

AdamBrousseau commented Nov 8, 2024

AdamBrousseau commented Nov 11, 2024

AswathySK commented Nov 12, 2024

AdamBrousseau Nov 12, 2024

AswathySK Nov 12, 2024 •

edited

Loading

AdamBrousseau Nov 14, 2024

sxa Nov 19, 2024

AswathySK Dec 2, 2024

sxa Dec 4, 2024

AdamBrousseau Dec 5, 2024

sxa Dec 6, 2024

karianna commented Dec 5, 2024

sxa left a comment •

edited

Loading

sxa Dec 5, 2024 •

edited

Loading

sxa Dec 5, 2024

sxa Dec 5, 2024

sxa Dec 5, 2024 •

edited

Loading

	- name: Install additional build tools if NOT RHEL8 and above
	- name: Install additional build tools if NOT RHEL8 and above

	- name: Install Java when RedHat 8 and RedHat 9
	- name: Install Java when RedHat 8 and later

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

sxa Dec 5, 2024 • edited Loading

Choose a reason for hiding this comment

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

AswathySK Nov 12, 2024 •

edited

Loading

sxa left a comment •

edited

Loading

sxa Dec 5, 2024 •

edited

Loading

sxa Dec 5, 2024 •

edited

Loading