unixPB: undo relative version conditionals

Signed-off-by: Stewart X Addison <[email protected]>

Author: sxa

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

@@ -39,7 +39,9 @@
 - name: Enable CodeReady Builder repo for CentOS9 Stream
   shell: dnf config-manager --set-enabled crb
   when:
-  when: ansible_distribution_major_version|int > 8
+    - ansible_distribution_major_version != "6"
+    - ansible_distribution_major_version != "7"
+    - ansible_distribution_major_version != "8"
   tags: patch_update
 
 - name: Clean dnf cache
@@ -72,37 +74,41 @@
 - name: Install additional build tools for CentOS 8+
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Build_Tools_CentOS8_Plus }}"
-  when: ansible_distribution_major_version|int > 7
+  when:
+    - ansible_distribution_major_version != "6"
+    - ansible_distribution_major_version != "7"
   tags: build_tools
 
-- name: Install additional build tools for NOT CentOS8/9
+- name: Install additional build tools when NOT CentOS8+
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Build_Tools_NOT_CentOS8_CentOS9Stream }}"
-  when: ansible_distribution_major_version|int < 8
+  when:
+    - ansible_distribution_major_version != "6"
+    - ansible_distribution_major_version != "7"
   tags: build_tools
 
 - name: Install additional test tools for CentOS 10+ e.g. weston
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Test_Tools_CentOS10_Plus }}"
-  when: ansible_distribution_major_version|int > 9
+  when:
+    - ansible_distribution_major_version != "6"
+    - ansible_distribution_major_version != "7"
+    - ansible_distribution_major_version != "8"
+    - ansible_distribution_major_version != "9"
   tags: test_tools
 
 - name: Install additional tools for CentOS pre-10
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Test_Tools_PreCentOS10 }}"
-  when: ansible_distribution_major_version|int < 10
+  when:
+    - ansible_distribution_major_version != "10"
   tags: test_tools
 
 - name: Install libdwarf.h for CentOS8 Stream
   shell: dnf --enablerepo=powertools install libdwarf-devel -y
   when: (ansible_distribution_major_version == "8") and (relfile_contents.stdout.find('Stream') != -1)
   tags: build_tools
 
-#- name: Install texinfo for CentOS10+
-#  shell: dnf --enablerepo=crb install texinfo -y
-#  when: ansible_distribution_major_version|int > 10
-#  tags: build_tools
-
 - name: Install additional build tools for CentOS 8 Stream
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Build_Tools_CentOS8_Stream }}"
@@ -132,7 +138,8 @@
 - name: Install jq for SBoM parsing for build reproducibility testing
   package: "name=jq state=latest"
   when:
-    - ansible_distribution_major_version|int > 7
+    - ansible_distribution_major_version != "6"
+    - ansible_distribution_major_version != "7"
   tags: test_tools
 
 - name: Add devtools-2 to yum repo list for gcc 4.8
@@ -317,8 +324,8 @@
     name: java
     path: "{{ jre_path.stat.lnk_source }}/bin/java"
   when:
-    - ansible_distribution_major_version|int > 6
-    - ansible_distribution_major_version|int < 10
+    - ansible_distribution_major_version != "6"
+    - ansible_distribution_major_version != "10"
   tags: default_java
 
 - name: Set Default JDK (CentOS 6)