Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ansible: use gcc 4.9 on CentOS 6 #809

Merged
merged 1 commit into from
Nov 13, 2017
Merged

ansible: use gcc 4.9 on CentOS 6 #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 10 deletions setup/centos6/ansible-playbook.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,8 @@
yum: name=* state=latest
tags: general

- name: General | Add SLC devtoolset repo
command: curl -sL http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo -o /etc/yum.repos.d/slc6-devtoolset.repo
tags: general

- name: General | Add SLC devtoolset repo GPG key
command: rpm --import http://linuxsoft.cern.ch/cern/slc6X/x86_64/RPM-GPG-KEY-cern
tags: general

- name: General | Download SLC SCL repo config
command: curl http://linuxsoft.cern.ch/cern/scl/slc6-scl.repo -o /etc/yum.repos.d/slc6-scl.repo
- name: General | Add SCL repo
yum: name=centos-release-scl state=latest
tags: general

- name: General | Install required packages
Expand Down
2 changes: 1 addition & 1 deletion setup/centos6/ansible-vars.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ server_user: iojs
packages:
- git
- java-1.8.0-openjdk
- devtoolset-2
- devtoolset-6
- git19
- libtool
- make
Expand Down
2 changes: 1 addition & 1 deletion setup/centos6/resources/jenkins.sysconfig.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ JENKINS_SLAVE_LOG="/home/iojs/$NAME.log"
JENKINS_SECRET="{{ secret }}"
JENKINS_SLAVE_ARGS="-jnlpUrl https://{{ ci_server }}/computer/{{ ansible_hostname }}/slave-agent.jnlp -secret $JENKINS_SECRET"
JENKINS_ENV="OSTYPE=linux-gnu NODE_COMMON_PIPE=/home/iojs/test.pipe"
JENKINS_PATH="/opt/rh/devtoolset-2/root/usr/bin"
JENKINS_PATH="/opt/rh/devtoolset-6/root/usr/bin"
JENKINS_ENV="JOBS={{ ansible_processor_vcpus }} \
HOME=/home/{{ server_user }} \
NODE_TEST_DIR=$HOME/tmp \
Expand Down
2 changes: 1 addition & 1 deletion setup/centos6/resources/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh

rm -f nohup.out
NODE_COMMON_PIPE=/home/iojs/test.pipe OSTYPE=linux-gnu nohup scl enable devtoolset-2 'java -jar slave.jar -jnlpUrl https://ci.nodejs.org/computer/iojs-digitalocean-centos6-64-{{id}}/slave-agent.jnlp -secret {{secret}}' &
NODE_COMMON_PIPE=/home/iojs/test.pipe OSTYPE=linux-gnu nohup scl enable devtoolset-6 'java -jar slave.jar -jnlpUrl https://ci.nodejs.org/computer/iojs-digitalocean-centos6-64-{{id}}/slave-agent.jnlp -secret {{secret}}' &
OSTYPE=linux-gnu nohup scl enable git19 'java -jar slave.jar -jnlpUrl https://ci.nodejs.org/computer/iojs-digitalocean-centos6-64-gcc44-{{gcc44_id}}/slave-agent.jnlp -secret {{gcc44_secret}}' &