From 30cc2b846edfcc5f699afc3ca5cc0c0a5c755171 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Thu, 3 Aug 2017 14:36:08 +0100
Subject: [PATCH] Variable overrides for Arch Linux

Part of #2550
---
 contrib/ci-workers/templates/buildbot-worker.service.j2 | 6 +++---
 contrib/ci-workers/unix.yml                             | 6 ++++++
 contrib/ci-workers/vars/Archlinux.yml                   | 7 +++++++
 contrib/ci-workers/vars/default.yml                     | 3 +++
 4 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 contrib/ci-workers/vars/Archlinux.yml

diff --git a/contrib/ci-workers/templates/buildbot-worker.service.j2 b/contrib/ci-workers/templates/buildbot-worker.service.j2
index 1fee26aa3..ffe497bcf 100644
--- a/contrib/ci-workers/templates/buildbot-worker.service.j2
+++ b/contrib/ci-workers/templates/buildbot-worker.service.j2
@@ -7,9 +7,9 @@ After=network.target
 Type=forking
 PIDFile=/home/{{ buildbot_worker_user }}/{{ buildbot_worker_name }}/twistd.pid
 WorkingDirectory=/home/{{ buildbot_worker_user }}
-ExecStart=/usr/local/bin/buildbot-worker start {{ buildbot_worker_name }}
-ExecReload=/usr/local/bin/buildbot-worker restart {{ buildbot_worker_name }}
-ExecStop=/usr/local/bin/buildbot-worker stop {{ buildbot_worker_name }}
+ExecStart={{ pip_bin_dir }}/buildbot-worker start {{ buildbot_worker_name }}
+ExecReload={{ pip_bin_dir }}/buildbot-worker restart {{ buildbot_worker_name }}
+ExecStop={{ pip_bin_dir }}/buildbot-worker stop {{ buildbot_worker_name }}
 Restart=always
 User={{ buildbot_worker_user }}
 
diff --git a/contrib/ci-workers/unix.yml b/contrib/ci-workers/unix.yml
index ad78f7914..763d8fe45 100644
--- a/contrib/ci-workers/unix.yml
+++ b/contrib/ci-workers/unix.yml
@@ -67,6 +67,12 @@
         package_deps: "{{ buildbot_deps + fetch_deps + conf_deps + build_deps + link_deps + dist_deps }}"
         python_modules: "{{ buildbot_modules + rpc_test_modules }}"
 
+    - name: Update rolling release [Arch Linux]
+      pacman:
+        update_cache: yes
+        upgrade: yes
+      when: ansible_distribution == 'Archlinux'
+
     - name: Install required packages
       package:
         name: "{{ item }}"
diff --git a/contrib/ci-workers/vars/Archlinux.yml b/contrib/ci-workers/vars/Archlinux.yml
new file mode 100644
index 000000000..ac4a44e5b
--- /dev/null
+++ b/contrib/ci-workers/vars/Archlinux.yml
@@ -0,0 +1,7 @@
+---
+buildbot_deps:
+  - python2-pip
+build_deps:
+  - multilib/gcc
+  - make
+pip_bin_dir: /usr/bin
diff --git a/contrib/ci-workers/vars/default.yml b/contrib/ci-workers/vars/default.yml
index 13a04e7b4..67da0e51d 100644
--- a/contrib/ci-workers/vars/default.yml
+++ b/contrib/ci-workers/vars/default.yml
@@ -39,3 +39,6 @@ buildbot_modules:
 rpc_test_modules:
   - pyblake2
   - pyzmq
+
+# Environment variables
+pip_bin_dir: /usr/local/bin