diff --git a/ansible/roles/baselayout/tasks/partials/repo/centos6.yml b/ansible/roles/baselayout/tasks/partials/repo/centos6.yml index feac8043a..8941d17ff 100644 --- a/ansible/roles/baselayout/tasks/partials/repo/centos6.yml +++ b/ansible/roles/baselayout/tasks/partials/repo/centos6.yml @@ -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" diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml index 03c289031..d01d0acb6 100644 --- a/ansible/roles/baselayout/vars/main.yml +++ b/ansible/roles/baselayout/vars/main.yml @@ -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', ], diff --git a/ansible/roles/jenkins-worker/templates/centos.initd.j2 b/ansible/roles/jenkins-worker/templates/centos.initd.j2 index f18b274d1..dc9e6bd34 100644 --- a/ansible/roles/jenkins-worker/templates/centos.initd.j2 +++ b/ansible/roles/jenkins-worker/templates/centos.initd.j2 @@ -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//::/:}"