From 642285995cbc9b6c8dd52fa3553cfd315727bcd4 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Tue, 5 Oct 2021 18:34:58 +0100 Subject: [PATCH] Vanishing_commit --- .../roles/Common/tasks/CentOS.yml | 10 ---------- .../roles/Common/vars/CentOS.yml | 5 ----- 2 files changed, 15 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 index 806aec6f3d..0fde3762e2 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/CentOS.yml @@ -79,16 +79,6 @@ - ! (ansible_distribution_major_version == "7" and ansible_architecture == "s390x") tags: build_tools -- name: Add devtools-2 to yum repo list for gcc 4.8 - get_url: - url: https://people.centos.org/tru/devtools-2/devtools-2.repo - dest: /etc/yum.repos.d/devtools-2.repo - timeout: 25 - checksum: sha256:a8ebeb4bed624700f727179e6ef771dafe47651131a00a78b342251415646acc - when: - - ansible_distribution_major_version == "6" - tags: build_tools - - name: Install CentOS SCL x86_64 repo for gcc7.3 package: "name=centos-release-scl state=latest" when: diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/vars/CentOS.yml index ebd932974a..29ead08b43 100644 --- 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 @@ Build_Tool_Packages: - xz - zip -gcc48_devtoolset_compiler: - - devtoolset-2-gcc - - devtoolset-2-binutils - - devtoolset-2-gcc-c++ - Additional_Build_Tools_CentOS7: - libstdc++-static - ccache