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.

Sign up for GitHub

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

Jump to bottom

Add conditionals for Rhel9 in common role #3802

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add conditionals for Rhel9 in common role #3802

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/RedHat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
- ansible_architecture == "x86_64"
tags: patch_update

- name: Enable EPEL release for RHEL8 or RHEL6 or RHEL7
- name: Enable EPEL release for RHEL9 or RHEL8 or RHEL6 or RHEL7
yum: name=https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm
failed_when: false
when:
- ansible_architecture != "s390x"
- (ansible_distribution_major_version == "8") or (ansible_distribution_major_version == "6") or (ansible_distribution_major_version == "7")
- (ansible_distribution_major_version == "9") or (ansible_distribution_major_version == "8") or (ansible_distribution_major_version == "6") or (ansible_distribution_major_version == "7")
tags: patch_update

- name: YUM upgrade all packages
Expand Down Expand Up @@ -52,11 +52,11 @@
##########################
# Additional build tools #
##########################
- name: Install additional build tools if NOT RHEL 8
- name: Install additional build tools if NOT RHEL 8 AND RHEL9
package: "name={{ item }} state=latest"
with_items: "{{ Additional_Build_Tools_NOT_RHEL8 }}"
when:
- (ansible_distribution_major_version != "8")
- (ansible_distribution_major_version != "8" and ansible_distribution_major_version != "9")
tags: build_tools

- name: Install additional build tools for RHEL 7
Expand Down Expand Up @@ -102,11 +102,11 @@
- (ansible_distribution_major_version == "6") or (ansible_distribution_major_version == "7")
tags: build_tools

- name: Install additional build tools for RHEL 8
- name: Install additional build tools for RHEL 8 or RHEL9
package: "name={{ item }} state=latest"
with_items: "{{ Additional_Build_Tools_RHEL8 }}"
when:
- (ansible_distribution_major_version == "8")
- (ansible_distribution_major_version == "8") or (ansible_distribution_major_version == "9")
tags: build_tools

- name: Install jq for SBoM parsing for build reproducibility testing
Expand Down Expand Up @@ -136,17 +136,17 @@
with_items: "{{ Java_NOT_RHEL6_PPC64 }}"
when:
- not (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")
- not (ansible_distribution_major_version == "8")
- not (ansible_distribution_major_version == "8" or ansible_distribution_major_version == "9" )

- 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
package: "name={{ item }} state=latest"
with_items: "{{ Java_RHEL8 }}"
when: (ansible_distribution_major_version == "8")
when: (ansible_distribution_major_version == "8" or ansible_distribution_major_version == "9")

####################
# Set default Java #
Expand Down
Loading