diff --git a/ansible/roles/baselayout/tasks/partials/repo/centos7.yml b/ansible/roles/baselayout/tasks/partials/repo/centos7.yml index ae6c3418d..e9771a6b6 100644 --- a/ansible/roles/baselayout/tasks/partials/repo/centos7.yml +++ b/ansible/roles/baselayout/tasks/partials/repo/centos7.yml @@ -12,20 +12,12 @@ state: present -- name: centos7 | install scl for devtoolset-6 - when: "arch != 'arm64' and arch != 'ppc64'" +- name: centos7 | install scl for devtoolset-6, devtoolset-8 + when: "arch != 'arm64'" yum: name: centos-release-scl state: present -- name: centos7 | ppc64 | install sclo7 devtoolset-6 - when: "arch == 'ppc64'" - yum_repository: - name: sclo7-devtoolset-6 - description: cbs.centos.org sclo7-devtoolset-6-rh-release - baseurl: https://cbs.centos.org/repos/sclo7-devtoolset-6-rh-release/$basearch/os/ - gpgcheck: no - - name: centos7 | aarch64 | install sclo repo when: "arch == 'arm64'" copy: @@ -40,7 +32,8 @@ dest: "/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo" mode: 0644 -- stat: path=/usr/local/bin/python3.7 +- stat: + path: /usr/local/bin/python3.7 register: build_python37 - name: centos7 | ppc64 | download python 3.7 diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index a6edd3512..b6534ace2 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -43,7 +43,7 @@ packages: { centos7_x64: ['git2u','centos-release-scl',], # centos-release-scl is required to enable SCLo # but we do it manually in partials/repo/centos7.yml for arm64 centos7: [ - 'bzip2-devel,openssl-devel,ccache,gcc-c++,devtoolset-6,sudo,git,devtoolset-6-libatomic-devel,zlib-devel,libffi-devel', + 'bzip2-devel,openssl-devel,ccache,gcc-c++,devtoolset-6,sudo,git,devtoolset-6-libatomic-devel,zlib-devel,libffi-devel,devtoolset-8,devtoolset-8-libatomic-devel', ], aix: [