unixPB: Remove devtoolset-7 and require Adopt's GCC7.5 (#1166)

Signed-off-by: Stewart Addison <sxa@uk.ibm.com>
adoptium · Feb 24, 2020 · 6c9c743 · 6c9c743
1 parent 238e3c8
commit 6c9c743
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 18 deletions.
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml
@@ -96,14 +96,6 @@
     - ansible_distribution_major_version != "8"
   tags: build_tools
 
-- name: Install gcc7.3
-  package: "name={{ item }} state=latest"
-  with_items: "{{ gcc73_devtoolset_compiler }}"
-  when:
-    - ansible_architecture == "x86_64"
-    - ansible_distribution_major_version != "8"
-  tags: build_tools
-
 - name: Install additional build tools for CentOS on x86
   package: "name={{ item }} state=latest"
   with_items: "{{ Additional_Build_Tools_CentOS_x86 }}"

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml
@@ -54,11 +54,6 @@ gcc48_devtoolset_compiler:
   - devtoolset-2-binutils
   - devtoolset-2-gcc-c++
 
-gcc73_devtoolset_compiler:
-  - devtoolset-7-gcc              # OpenJ9
-  - devtoolset-7-binutils         # OpenJ9
-  - devtoolset-7-gcc-c++          # OpenJ9
-
 Additional_Build_Tools_CentOS7:
   - libstdc++-static
 

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_7/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/gcc_7/tasks/main.yml
@@ -1,11 +1,11 @@
 ---
-##########
-# gcc_73 #
-##########
+#########
+# gcc_7 #
+#########
 
 
-- name: Check if gcc-7 is installed on RHEL/CentOS
-  shell: /opt/rh/devtoolset-7/root/usr/bin/gcc --version 2>&1 > /dev/null || /usr/local/gcc/bin/gcc-7.3 --version 2>&1 > /dev/null || /usr/local/gcc/bin/gcc-7.4 --version 2>&1 > /dev/null || /usr/bin/gcc-7.3 --version 2>&1 > /dev/null
+- name: Check if gcc 7.5 is installed on RHEL/CentOS
+  shell: /usr/local/gcc/bin/gcc-7.5 --version 2>&1 > /dev/null
   ignore_errors: yes
   register: gcc7_installed
   tags: gcc-7