Reinstate relative comparisons without quotes

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

Author: sxa

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

@@ -39,9 +39,7 @@
 - name: Enable CodeReady Builder repo for CentOS9 Stream
   shell: dnf config-manager --set-enabled crb
   when:
-    - ansible_distribution_major_version != "6"
-    - ansible_distribution_major_version != "7"
-    - ansible_distribution_major_version != "8"
+    - ansible_distribution_major_version| int > 8
   tags: patch_update
 
 - name: Clean dnf cache
@@ -75,33 +73,29 @@
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Build_Tools_CentOS8_Plus }}"
   when:
-    - ansible_distribution_major_version != "6"
-    - ansible_distribution_major_version != "7"
+    - ansible_distribution_major_version|int > 7
+    - ansible_distribution_major_version|int > 7
   tags: build_tools
 
 - 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 != "6"
-    - ansible_distribution_major_version != "7"
+    - ansible_distribution_major_version|int < 8
   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 != "6"
-    - ansible_distribution_major_version != "7"
-    - ansible_distribution_major_version != "8"
-    - ansible_distribution_major_version != "9"
+    - ansible_distribution_major_version|int > 10
   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 != "10"
+    - ansible_distribution_major_version|int < 10
   tags: test_tools
 
 - name: Install libdwarf.h for CentOS8 Stream
@@ -324,8 +318,8 @@
     name: java
     path: "{{ jre_path.stat.lnk_source }}/bin/java"
   when:
-    - ansible_distribution_major_version != "6"
-    - ansible_distribution_major_version != "10"
+    - ansible_distribution_major_version|int > 6
+    - ansible_distribution_major_version|int < 10
   tags: default_java
 
 - name: Set Default JDK (CentOS 6)
@@ -341,8 +335,8 @@
     name: javac
     path: "{{ jdk_path.stat.lnk_source }}/bin/javac"
   when:
-    - ansible_distribution_major_version != "6"
-    - ansible_distribution_major_version != "10"
+    - ansible_distribution_major_version|int > 6
+    - ansible_distribution_major_version|int < 10
   tags: default_java
 
 ###########

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

@@ -86,6 +86,7 @@ Additional_Build_Tools_CentOS8_Plus:
 Additional_Build_Tools_NOT_CentOS8_CentOS9Stream:
   - lbzip2
   - java-1.7.0-openjdk-devel
+  - java-1.8.0-openjdk-devel
   - ntp
 
 Additional_Build_Tools_CentOS_x86: