From ae5001040622fc222ffc7b6675f1b2a90056602c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= <bugs@bergstroem.nu>
Date: Fri, 13 Nov 2015 10:39:08 +1100
Subject: [PATCH] smartos: add new hosts and update playbooks

---
 setup/ansible-inventory                                     | 2 ++
 setup/smartos/README.md                                     | 6 ++++++
 setup/smartos/ansible-vars.yaml                             | 4 ++--
 .../smartos/host_vars/nodejs-release-joyent-smartos153-64-1 | 2 ++
 setup/smartos/resources/jenkins_manifest.xml                | 3 ++-
 5 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 setup/smartos/host_vars/nodejs-release-joyent-smartos153-64-1

diff --git a/setup/ansible-inventory b/setup/ansible-inventory
index 1920d4863..633582d5e 100644
--- a/setup/ansible-inventory
+++ b/setup/ansible-inventory
@@ -42,6 +42,8 @@ iojs-build-ubuntu1204-64-1
 [iojs-build-smartos]
 iojs-build-smartos-64-1
 iojs-build-smartos-32-1
+iojs-joyent-smartos13.3.1-release
+nodejs-release-joyent-smartos153-64-1
 
 [iojs-build-freebsd101-32]
 iojs-build-freebsd101-32-1
diff --git a/setup/smartos/README.md b/setup/smartos/README.md
index d6d7cb6e2..01fc870c2 100644
--- a/setup/smartos/README.md
+++ b/setup/smartos/README.md
@@ -9,6 +9,12 @@ Host iojs-build-smartos-64-1
 Host iojs-build-smartos-32-1
   HostName 165.225.138.254
   User root
+
+Host iojs-joyent-smartos13.3.1-release
+  HostName 72.2.114.225
+
+Host nodejs-release-joyent-smartos153-64-1
+  Hostname 72.2.115.68
 ```
 
 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.
diff --git a/setup/smartos/ansible-vars.yaml b/setup/smartos/ansible-vars.yaml
index 8206ea2b0..20792e9c9 100644
--- a/setup/smartos/ansible-vars.yaml
+++ b/setup/smartos/ansible-vars.yaml
@@ -11,8 +11,8 @@ ssh_users:
 packages:
   - openjdk7
   - git
-  - gcc49
-  - gcc49-libs
+  - gcc48
+  - gcc48-libs
   - gccmakedep
   - gmake
   - automake
diff --git a/setup/smartos/host_vars/nodejs-release-joyent-smartos153-64-1 b/setup/smartos/host_vars/nodejs-release-joyent-smartos153-64-1
new file mode 100644
index 000000000..98a17bd06
--- /dev/null
+++ b/setup/smartos/host_vars/nodejs-release-joyent-smartos153-64-1
@@ -0,0 +1,2 @@
+server_id: nodejs-release-joyent-smartos153-64-1
+server_secret: a32834c6f9bbdee4f64ceb8c52105bcb741d765cc1a3975a21c706bc0d7f7cb1
diff --git a/setup/smartos/resources/jenkins_manifest.xml b/setup/smartos/resources/jenkins_manifest.xml
index b0f57aa75..76f0abacc 100644
--- a/setup/smartos/resources/jenkins_manifest.xml
+++ b/setup/smartos/resources/jenkins_manifest.xml
@@ -22,13 +22,14 @@
                 <envvar name='HOME' value='/home/iojs' />
                 <envvar name='JOBS' value='8' />
                 <envvar name='DESTCPU' value='{{destcpu}}' />
+                <envvar name='ARCH' value='{{destcpu}}' />
                 <envvar name='PATH' value='/opt/local/libexec/ccache:/usr/local/sbin:/usr/local/bin:/opt/local/sbin:/opt/local/bin:/usr/sbin:/usr/bin:/sbin' />
             </method_environment>
         </method_context>
 
         <exec_method type='method'
                      name='start'
-                     exec='/opt/local/bin/java -Xmx512m -jar slave.jar -jnlpUrl https://ci.nodejs.org/computer/iojs-joyent-smartos-{{id}}/slave-agent.jnlp -secret {{secret}} >> /home/iojs/jenkins_console.log'
+                     exec='/opt/local/bin/java -Xmx512m -jar slave.jar -jnlpUrl https://ci.nodejs.org/computer/{{id}}/slave-agent.jnlp -secret {{secret}} >> /home/iojs/jenkins_console.log'
                      timeout_seconds='60' />
 
         <exec_method type="method"