|
16 | 16 | - ansible_architecture == "x86_64"
|
17 | 17 | tags: patch_update
|
18 | 18 |
|
19 |
| -- name: Enable EPEL release for RHEL8 or RHEL6 or RHEL7 |
| 19 | +- name: Enable EPEL release for RHEL9 or RHEL8 or RHEL6 or RHEL7 |
20 | 20 | yum: name=https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm
|
21 | 21 | failed_when: false
|
22 | 22 | when:
|
23 | 23 | - ansible_architecture != "s390x"
|
24 |
| - - (ansible_distribution_major_version == "8") or (ansible_distribution_major_version == "6") or (ansible_distribution_major_version == "7") |
| 24 | + - (ansible_distribution_major_version | int >= 6) |
25 | 25 | tags: patch_update
|
26 | 26 |
|
27 | 27 | - name: YUM upgrade all packages
|
|
52 | 52 | ##########################
|
53 | 53 | # Additional build tools #
|
54 | 54 | ##########################
|
55 |
| -- name: Install additional build tools if NOT RHEL 8 |
| 55 | +- name: Install additional build tools if NOT RHEL 8 AND RHEL9 |
56 | 56 | package: "name={{ item }} state=latest"
|
57 | 57 | with_items: "{{ Additional_Build_Tools_NOT_RHEL8 }}"
|
58 | 58 | when:
|
59 |
| - - (ansible_distribution_major_version != "8") |
| 59 | + - not (ansible_distribution_major_version | int >= 8) |
60 | 60 | tags: build_tools
|
61 | 61 |
|
62 | 62 | - name: Install additional build tools for RHEL 7
|
|
102 | 102 | - (ansible_distribution_major_version == "6") or (ansible_distribution_major_version == "7")
|
103 | 103 | tags: build_tools
|
104 | 104 |
|
105 |
| -- name: Install additional build tools for RHEL 8 |
| 105 | +- name: Install additional build tools for RHEL >= 8 |
106 | 106 | package: "name={{ item }} state=latest"
|
107 | 107 | with_items: "{{ Additional_Build_Tools_RHEL8 }}"
|
108 | 108 | when:
|
109 |
| - - (ansible_distribution_major_version == "8") |
| 109 | + - (ansible_distribution_major_version | int >= 8) |
110 | 110 | tags: build_tools
|
111 | 111 |
|
112 | 112 | - name: Install jq for SBoM parsing for build reproducibility testing
|
|
136 | 136 | with_items: "{{ Java_NOT_RHEL6_PPC64 }}"
|
137 | 137 | when:
|
138 | 138 | - not (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")
|
139 |
| - - not (ansible_distribution_major_version == "8") |
| 139 | + - not (ansible_distribution_major_version | int >= 8) |
140 | 140 |
|
141 | 141 | - name: Install Java when RedHat 6 on ppc64
|
142 | 142 | package: "name={{ item }} state=latest"
|
143 | 143 | with_items: "{{ Java_RHEL6_PPC64 }}"
|
144 | 144 | when: (ansible_distribution_major_version == "6" and ansible_architecture == "ppc64")
|
145 | 145 |
|
146 |
| -- name: Install Java when RedHat 8 |
| 146 | +- name: Install Java when RedHat 8 and RedHat 9 |
147 | 147 | package: "name={{ item }} state=latest"
|
148 | 148 | with_items: "{{ Java_RHEL8 }}"
|
149 |
| - when: (ansible_distribution_major_version == "8") |
| 149 | + when: (ansible_distribution_major_version | int >= 8) |
150 | 150 |
|
151 | 151 | ####################
|
152 | 152 | # Set default Java #
|
|
0 commit comments