Skip to content

Commit

Permalink
freebsd: assorted updates
Browse files Browse the repository at this point in the history
Few things improved:
 - switch to openjdk-jre which has less dependencies
 - introduce `-r` to daemon(8) which restarts child on exit
 - pass BROADCAST since `255.255.255.255` isn't always available
 - add `-r` to linters as well
  • Loading branch information
jbergstroem committed Sep 16, 2015
1 parent 15e8935 commit 7a26090
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion setup/freebsd/ansible-vars.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ssh_users:
- rvagg
- jbergstroem
packages:
- openjdk
- openjdk-jre
- git
- gmake
- ccache
7 changes: 4 additions & 3 deletions setup/freebsd/resources/jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ load_rc_config "${name}"
OSTYPE="freebsd"
NODE_COMMON_PIPE="/home/iojs/test.pipe"
LOCALHOST="{{interface}}"
BROADCAST="{{broadcast}}"
PATH="/usr/local/libexec/ccache:/usr/local/bin:${PATH}"

jenkins_jnlpurl="https://jenkins-iojs.nodesource.com/computer/iojs-voxer-freebsd101-{{id}}/slave-agent.jnlp"
Expand All @@ -39,9 +40,9 @@ jenkins_group="iojs"

pidfile="/var/run/jenkins/jenkins.pid"
command="/usr/sbin/daemon"
procname="/usr/local/openjdk7/bin/java"
command_args="-p ${pidfile} ${procname} -jar ${jenkins_jar} ${jenkins_args} > ${jenkins_log_file} 2>&1"
env="PATH=${PATH} LOCALHOST=${LOCALHOST} OSTYPE=${OSTYPE} NODE_COMMON_PIPE=${NODE_COMMON_PIPE} CC=cc CXX=c++"
procname="/usr/local/openjdk7-jre/bin/java"
command_args="-r -p ${pidfile} ${procname} -jar ${jenkins_jar} ${jenkins_args} > ${jenkins_log_file} 2>&1"
env="PATH=${PATH} BROADCAST=${BROADCAST} LOCALHOST=${LOCALHOST} OSTYPE=${OSTYPE} NODE_COMMON_PIPE=${NODE_COMMON_PIPE} CC=cc CXX=c++"
required_files="${procname} ${jenkins_jar}"

start_precmd="jenkins_prestart"
Expand Down
2 changes: 1 addition & 1 deletion setup/linter/resources/jenkins
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jenkins_group="iojs"
pidfile="/var/run/jenkins/jenkins.pid"
command="/usr/sbin/daemon"
procname="/usr/local/openjdk7/bin/java"
command_args="-p ${pidfile} ${procname} -jar ${jenkins_jar} ${jenkins_args} > ${jenkins_log_file} 2>&1"
command_args="-r -p ${pidfile} ${procname} -jar ${jenkins_jar} ${jenkins_args} > ${jenkins_log_file} 2>&1"
env="PATH=${PATH} OSTYPE=${OSTYPE} NODE_COMMON_PIPE=${NODE_COMMON_PIPE} CC=cc CXX=c++"
required_files="${procname} ${jenkins_jar}"

Expand Down

0 comments on commit 7a26090

Please sign in to comment.