freebsd: refactor init scripts

Improve the daemon monitoring facility by avoiding `su` as part
of starting the script.

Also, modernise playbooks and update README.md

PR-URL: #391
Reviewed-By: Rod Vagg <[email protected]>

Author: jbergstroem

setup/freebsd/README.md

@@ -1,6 +1,6 @@
 # io.js Build FreeBSD Setup
 
-The current FreeBSD lives at Digitalocean.
+## Setting up
 
 To set up hosts, make sure you add them to your ssh config first:
 ```
@@ -13,14 +13,19 @@ Host test-digitalocean-freebsd10-x64-2
   User freebsd
 ```
 
-Note that these hostnames are also used in the ansible-inventory file. The IP addresses will need to be updated each time the servers are reprovisioned.
-
-To set up a host, run:
+You will also have to install python (ansible dependency):
+```bash
+$ ssh test-digitalocean-freebsd10-x64-1 sudo pkg install -y python
+```
 
-```text
+Now you're ready to run the playbook:
+```bash
 $ ansible-playbook -i ../ansible-inventory ansible-playbook.yaml
 ```
 
-**Users**: The ansible-vars.yaml file contains a list of users who's GitHub public keys are pulled and placed into
-authorized_keys for both root and iojs users. This file should be updates when new users are added to the build project
-who are able to help maintain the containerized builds.
+## Restarting jenkins
+
+If you ever need to restart jenkins:
+```bash
+$ ssh test-digitalocean-freebsd10-x64-1 sudo service jenkins restart
+```

setup/freebsd/ansible-playbook.yaml

@@ -8,7 +8,6 @@
     - ansible_python_interpreter: "/usr/bin/env python"
 
   tasks:
-
     - include_vars: ansible-vars.yaml
       tags: vars
 
@@ -17,7 +16,7 @@
       tags: general
 
     - name: General | Install required packages
-      command: pkg install -U -y  {{ item }}
+      command: pkg install -U -y {{ item }}
       with_items: packages
       tags: general
 
@@ -26,30 +25,17 @@
       tags: user
 
     - name: User | Add {{ server_user }} user
-      user: name="{{ server_user }}" shell=/bin/sh append=yes groups={{ server_user }}
+      user: name="{{ server_user }}" append=yes groups={{ server_user }}
       tags: user
 
-
     - name: Jenkins | Download Jenkins' slave.jar
-      command: curl -sL https://ci.nodejs.org/jnlpJars/slave.jar -o /home/{{ server_user }}/slave.jar
-      tags: jenkins
-
-    - name: Jenkins | Copy init script
-      copy: src=./resources/jenkins dest={{ init_script_path }} owner={{ server_user }} group={{ server_user }} mode=0755
-      tags: jenkins
-
-    - name: Jenkins | Copy secret into init script
-      replace: dest={{ init_script_path }} regexp="\{\{secret\}\}" replace="{{ server_secret }}"
+      get_url: url=https://ci.nodejs.org/jnlpJars/slave.jar dest=/home/{{ server_user }}
       tags: jenkins
 
-    - name: Jenkins | Copy server id into init script
-      replace: dest={{ init_script_path }} regexp="\{\{id\}\}" replace="{{ server_id }}"
-      tags: jenkins
+    - name: Init | Generate and copy init script
+      template: src=./resources/jenkins.j2 dest=/usr/local/etc/rc.d
+      tags: init
 
-    - name: Jenkins | Enable init script at startup
-      lineinfile: dest=/etc/rc.conf line="jenkins_enable=YES"
-      tags: jenkins
-
-    - name: Jenkins | Start service
-      command: service jenkins start
-      tags: jenkins
+    - name: Init | Start Jenkins
+      service: name=jenkins state=started enabled=yes
+      tags: init

setup/freebsd/ansible-vars.yaml

@@ -1,6 +1,5 @@
 ---
 server_user: iojs
-init_script_path: /usr/local/etc/rc.d/jenkins
 packages:
   - openjdk-jre
   - git

setup/freebsd/resources/jenkins

@@ -0,0 +1,86 @@
+#!/bin/sh
+
+#
+# PROVIDE: jenkins
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+#
+# Configuration settings for jenkins in /etc/rc.conf:
+#
+# jenkins_enable (bool):
+#   Set to "NO" by default.
+#   Set it to "YES" to enable jenkins
+#
+
+. /etc/rc.subr
+
+name="jenkins"
+rcvar="jenkins_enable"
+load_rc_config ${name}
+
+# generated by ansible
+jenkins_jnlpurl="https://ci.nodejs.org/computer/{{ inventory_hostname }}/slave-agent.jnlp"
+jenkins_secret="{{ secret }}"
+jenkins_user="{{ server_user }}"
+jenkins_group="{{ server_user }}"
+# end generated by ansible
+
+required_files="${procname} ${jenkins_jar}"
+
+jenkins_env=" \
+  OSTYPE=freebsd \
+  NODE_COMMON_PIPE=/home/${jenkins_user}/test.pipe \
+  PATH=/usr/local/libexec/ccache:/usr/local/bin:${PATH} \
+  JOBS=$(getconf NPROCESSORS_ONLN) \
+  CC=cc \
+  CXX=c++"
+
+jenkins_jar="/home/${jenkins_user}/slave.jar"
+jenkins_log_file="/home/${jenkins_user}/${name}_console.log"
+jenkins_args="-jar ${jenkins_jar} \
+	-jnlpUrl ${jenkins_jnlpurl} \
+	-secret ${jenkins_secret}"
+
+# FreeBSD uses a java wrapper. Without full path pid monitoring won't work
+procname=$(cat /usr/local/etc/javavms | cut -d "#" -f 1)
+pidfile="/var/run/${name}/${name}.pid"
+monitor_pidfile="/var/run/${name}/${name}_monitor.pid"
+
+command="/usr/sbin/daemon"
+command_args="-f -r -p ${pidfile} -P ${monitor_pidfile} ${procname} \
+	${jenkins_args} -slaveLog ${jenkins_log_file}"
+
+start_precmd="${name}_prestart"
+stop_cmd="${name}_stop"
+
+jenkins_prestart() {
+	if [ ! -f "${jenkins_log_file}" ]; then
+		touch "${jenkins_log_file}"
+		chown "${jenkins_user}:${jenkins_group}" "${jenkins_log_file}"
+		chmod 640 "${jenkins_log_file}"
+	fi
+	if [ ! -d $(dirname ${pidfile}) ]; then
+		install -d -o "${jenkins_user}" -g "${jenkins_group}" \
+			-m 750 $(dirname ${pidfile})
+	fi
+
+	if [ ! ${jenkins_secret} ]; then
+		err 1 "You need to add a jenkins secret"
+	fi
+}
+
+# Kill monitor, not java since it would respawn
+jenkins_stop()
+{
+	if [ ! -f ${pidfile} -a ! -f ${monitor_pidfile} ]; then
+		echo "${name} isn't running."
+	else
+		echo -n "Stopping service: ${name}"
+		kill `cat ${monitor_pidfile}`
+		# files are removed on exit, but be extra sure
+		rm -f ${pidfile} ${monitor_pidfile}
+		echo .
+	fi
+}
+
+run_rc_command "$1"

setup/freebsd/resources/jenkins.j2

@@ -1,7 +1,6 @@
 # io.js Build Linter Setup
 
-These machines (currently just one) are run as part of the jenkins job,
-linting any code before passing it on to compile/test.
+## Setting up
 
 To set up hosts, make sure you add them to your ssh config first:
 ```
@@ -12,22 +11,20 @@ Host lint-joyent-freebsd10-x64-1
   HostName 72.2.114.23
 ```
 
-Note that these hostnames are also used in the ansible-inventory file.
-The IP addresses will need to be updated each time the servers
-are reprovisioned.
-
-Before running ansible you need to install Python (2.x):
+You will also have to install python (ansible dependency):
+```bash
+$ ssh lint-joyent-freebsd10-x64-1 sudo pkg install -y python
 ```
-$ ssh freebsd@iojs-linter1 sudo pkg install -y python
+
+Now you're ready to run the playbook:
+```bash
+$ ansible-playbook -i ../ansible-inventory ansible-playbook.yaml
 ```
 
-To set up a host, run:
+## Restarting jenkins
 
-```text
-$ ansible-playbook -i ../ansible-inventory ansible-playbook.yaml
+If you ever need to restart jenkins:
+```bash
+$ ssh lint-joyent-freebsd10-x64-1 sudo service jenkins restart
 ```
 
-**Users**: The ansible-vars.yaml file contains a list of users whose GitHub
-public keys are pulled and placed into authorized_keys for both root and
-iojs users. This file should be updates when new users are added to the
-build project who are able to help maintain the containerized builds.

setup/linter/README.md

@@ -8,7 +8,6 @@
     - ansible_python_interpreter: "/usr/bin/env python"
 
   tasks:
-
     - include_vars: ansible-vars.yaml
       tags: vars
 
@@ -17,7 +16,7 @@
       tags: general
 
     - name: General | Install required packages
-      command: pkg install -U -y  {{ item }}
+      command: pkg install -U -y {{ item }}
       with_items: packages
       tags: general
 
@@ -26,33 +25,17 @@
       tags: user
 
     - name: User | Add {{ server_user }} user
-      user: name="{{ server_user }}" shell=/bin/sh append=yes groups={{ server_user }}
+      user: name="{{ server_user }}" append=yes groups={{ server_user }}
       tags: user
 
-    - name: General | Keep iojs up to date
-      cron: name="update iojs" minute="0" hour="0" day="*/7" job="pkg update -q && pkg upgrade -yq iojs >/dev/null 2>&1"
-      tags: cron
-
     - name: Jenkins | Download Jenkins' slave.jar
-      command: curl -sL https://ci.nodejs.org/jnlpJars/slave.jar -o /home/{{ server_user }}/slave.jar
-      tags: jenkins
-
-    - name: Jenkins | Copy init script
-      copy: src=./resources/jenkins dest={{ init_script_path }} owner={{ server_user }} group={{ server_user }} mode=0755
-      tags: jenkins
-
-    - name: Jenkins | Copy secret into init script
-      replace: dest={{ init_script_path }} regexp="\{\{secret\}\}" replace="{{ server_secret }}"
+      get_url: url=https://ci.nodejs.org/jnlpJars/slave.jar dest=/home/{{ server_user }}
       tags: jenkins
 
-    - name: Jenkins | Copy server id into init script
-      replace: dest={{ init_script_path }} regexp="\{\{id\}\}" replace="{{ server_id }}"
-      tags: jenkins
+    - name: Init | Generate and copy init script
+      template: src=./resources/jenkins.j2 dest=/usr/local/etc/rc.d
+      tags: init
 
-    - name: Jenkins | Enable init script at startup
-      lineinfile: dest=/etc/rc.conf line="jenkins_enable=YES"
-      tags: jenkins
-
-    - name: Jenkins | Start service
-      command: service jenkins start
-      tags: jenkins
+    - name: Init | Start Jenkins
+      service: name=jenkins state=started enabled=yes
+      tags: init

setup/linter/ansible-playbook.yaml

@@ -1,10 +1,8 @@
 ---
 server_user: iojs
-init_script_path: /usr/local/etc/rc.d/jenkins
 packages:
   - openjdk
   - git
   - gmake
   - ccache
   - node
-  - llvm-devel