Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions ansible/roles/baselayout/tasks/partials/repo/centos6.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,6 @@
# centos6 - almost getting there
#

- name: "repo : add scl devtoolset"
yum_repository:
baseurl: http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo
gpgkey: http://ftp.scientificlinux.org/linux/scientific/5x/{{ ansible_architecture }}/RPM-GPG-KEYs/RPM-GPG-KEY-cern
gpgcheck: yes

- name: "repo : add scl"
yum_repository:
baseurl: http://linuxsoft.cern.ch/cern/scl/slc6-scl.repo
gpgkey: http://ftp.scientificlinux.org/linux/scientific/5x/{{ ansible_architecture }}/RPM-GPG-KEYs/RPM-GPG-KEY-cern
gpgcheck: yes

- name: install epel
yum:
name: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm"
Expand Down
5 changes: 5 additions & 0 deletions ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ packages: {
'gcc-c++', # even need this on centos6 so ccache has symlinks
],

centos6: [
'centos-release-scl',
'devtoolset-6'
],

debian7: [
'gcc-4.8,g++-4.8',
],
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/jenkins-worker/templates/centos.initd.j2
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ JENKINS_ENV="JOBS={{ ansible_processor_vcpus }} \
. /etc/rc.d/init.d/functions

# Add python/ccache path as well as regular path
JENKINS_PATH="/usr/lib64/ccache:/opt/rh/devtoolset-2/root/usr/bin:$PATH"
JENKINS_PATH="/usr/lib64/ccache:/opt/rh/devtoolset-6/root/usr/bin:$PATH"

# Replace potentially double colons since they add cwd
JENKINS_PATH="${JENKINS_PATH//::/:}"
Expand Down