unixPB: More updates to support CS10

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

Author: sxa

ansible/docker/Dockerfile.CentOS10

@@ -17,9 +17,11 @@ RUN echo "localhost ansible_connection=local" > /ansible/hosts
 
 RUN ansible-playbook --version
 
+RUN dnf -y install epel-release
+
 RUN set -eux; \
  cd /ansible; \
- ansible-playbook -i hosts ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml -e "git_sha=$git_sha" --skip-tags="debug,hosts_file,hostname,adoptopenjdk,jenkins,nagios,superuser,docker,swap_file,crontab,nvidia_cuda_toolkit"
+ ansible-playbook -i hosts ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml -e "git_sha=$git_sha" --skip-tags="hosts_file,hostname,adoptopenjdk,jenkins,nagios,superuser,docker,swap_file,crontab,nvidia_cuda_toolkit"
 
 RUN rm -rf /ansible; dnf remove ansible; dnf clean all
 

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

@@ -39,7 +39,7 @@
 - name: Enable CodeReady Builder repo for CentOS9 Stream
   shell: dnf config-manager --set-enabled crb
   when:
-    - ansible_distribution_major_version == "9"
+  when: ansible_distribution_major_version|int > 8
   tags: patch_update
 
 - name: Clean dnf cache
@@ -69,27 +69,40 @@
   when: ansible_distribution_major_version == "7"
   tags: build_tools
 
-- name: Install additional build tools for CentOS 8/9 Stream
+- name: Install additional build tools for CentOS 8+
   package: "name={{ item }} state=latest"
-  with_items: "{{ Additional_Build_Tools_CentOS8_CentOS9Stream }}"
-  when: ansible_distribution_major_version == "8" or ansible_distribution_major_version == "9" or ansible_distribution_major_version == "10"
+  with_items: "{{ Additional_Build_Tools_CentOS8_Plus }}"
+  when: ansible_distribution_major_version|int > 7
   tags: build_tools
 
 - name: Install additional build tools for NOT CentOS8/9
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Build_Tools_NOT_CentOS8_CentOS9Stream }}"
-  when:
-    - ansible_distribution_major_version != "8"
-    - ansible_distribution_major_version != "9"
-    - ansible_distribution_major_version != "10"
-
+  when: ansible_distribution_major_version|int < 8
   tags: build_tools
 
-- name: Install Libdwarf.h for CentOS8 Stream
+- 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
+  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
+  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 }}"
@@ -119,7 +132,7 @@
 - name: Install jq for SBoM parsing for build reproducibility testing
   package: "name=jq state=latest"
   when:
-    - ansible_distribution_major_version > "7"
+    - ansible_distribution_major_version|int > 7
   tags: test_tools
 
 - name: Add devtools-2 to yum repo list for gcc 4.8
@@ -303,8 +316,9 @@
   alternatives:
     name: java
     path: "{{ jre_path.stat.lnk_source }}/bin/java"
-  when:
-    - ansible_distribution_major_version > "6"
+uildwhen:
+    - ansible_distribution_major_version|int > 6
+    - ansible_distribution_major_version|int < 10
   tags: default_java
 
 - name: Set Default JDK (CentOS 6)
@@ -320,7 +334,8 @@
     name: javac
     path: "{{ jdk_path.stat.lnk_source }}/bin/javac"
   when:
-    - ansible_distribution_major_version > "6"
+    - ansible_distribution_major_version != "6"
+    - ansible_distribution_major_version != "10"
   tags: default_java
 
 ###########

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

@@ -29,7 +29,6 @@ Build_Tool_Packages:
   - gmp-devel
   - gnutls
   - gnutls-utils
-#  - java-1.8.0-openjdk-devel
   - libcurl-devel
   - libpng-devel
   - libXext-devel
@@ -57,7 +56,7 @@ Build_Tool_Packages:
   - pigz
   - strace                        # For SBOM dependency analysis
   - systemtap-sdt-devel
-#  - texinfo                       # For DevKit creation (binutils build)
+  - texinfo
   - unzip
   - wget
   - which
@@ -74,7 +73,7 @@ Additional_Build_Tools_CentOS7:
   - ccache
   - procps-ng
 
-Additional_Build_Tools_CentOS8_CentOS9Stream:
+Additional_Build_Tools_CentOS8_Plus:
   - glibc-locale-source
   - glibc-langpack-ja             # required for creating Japanese locales
   - glibc-langpack-ko             # required for creating Korean locales
@@ -103,6 +102,13 @@ Additional_Build_Tools_CentOS8_Stream:
 Additional_Build_Tools_NOT_CentOS8_Stream:
   - libdwarf-devel                # OpenJ9
 
+Additional_Test_Tools_CentOS10_Plus:
+  - weston
+  - xwayland-run
+
+Additional_Test_Tools_PreCentOS10:
+  - xorg-x11-server-Xvfb
+  
 Test_Tool_Packages:
   - gcc
   - gcc-c++
@@ -115,7 +121,6 @@ Test_Tool_Packages:
   - perl
   - perl-Test-Simple
   - xorg-x11-xauth
-#  - xorg-x11-server-Xvfb
   - fakeroot
   - gnutls
   - gnutls-utils