Skip to content

Commit bec0ae2

Browse files
committed
ansible: install devtoolset-8 on centos7
Refs: #2242 PR-URL: #2262
1 parent ea7eaac commit bec0ae2

File tree

2 files changed

+5
-12
lines changed

2 files changed

+5
-12
lines changed

ansible/roles/baselayout/tasks/partials/repo/centos7.yml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,12 @@
1212
state: present
1313

1414

15-
- name: centos7 | install scl for devtoolset-6
16-
when: "arch != 'arm64' and arch != 'ppc64'"
15+
- name: centos7 | install scl for devtoolset-6, devtoolset-8
16+
when: "arch != 'arm64'"
1717
yum:
1818
name: centos-release-scl
1919
state: present
2020

21-
- name: centos7 | ppc64 | install sclo7 devtoolset-6
22-
when: "arch == 'ppc64'"
23-
yum_repository:
24-
name: sclo7-devtoolset-6
25-
description: cbs.centos.org sclo7-devtoolset-6-rh-release
26-
baseurl: https://cbs.centos.org/repos/sclo7-devtoolset-6-rh-release/$basearch/os/
27-
gpgcheck: no
28-
2921
- name: centos7 | aarch64 | install sclo repo
3022
when: "arch == 'arm64'"
3123
copy:
@@ -40,7 +32,8 @@
4032
dest: "/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-SCLo"
4133
mode: 0644
4234

43-
- stat: path=/usr/local/bin/python3.7
35+
- stat:
36+
path: /usr/local/bin/python3.7
4437
register: build_python37
4538

4639
- name: centos7 | ppc64 | download python 3.7

ansible/roles/baselayout/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ packages: {
4343
centos7_x64: ['git2u','centos-release-scl',], # centos-release-scl is required to enable SCLo
4444
# but we do it manually in partials/repo/centos7.yml for arm64
4545
centos7: [
46-
'bzip2-devel,openssl-devel,ccache,gcc-c++,devtoolset-6,sudo,git,devtoolset-6-libatomic-devel,zlib-devel,libffi-devel',
46+
'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',
4747
],
4848

4949
aix: [

0 commit comments

Comments
 (0)