summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2014-03-05 05:14:52 (GMT)
committeranatoly techtonik <techtonik@gmail.com>2014-03-05 05:14:52 (GMT)
commitc99a4df5e53877ef52450229f39c8454f9315b8b (patch)
tree8eb46aa71093e2b1baf9418776826b44d43fdcf2
parentfa29d885681ed0ebdc3723525a18129fefcdc56a (diff)
downloadSCons-c99a4df5e53877ef52450229f39c8454f9315b8b.zip
SCons-c99a4df5e53877ef52450229f39c8454f9315b8b.tar.gz
SCons-c99a4df5e53877ef52450229f39c8454f9315b8b.tar.bz2
buildbot: Create buildbot workdir, and do not backup bot .hgrc
-rw-r--r--testing/buildbot.hosts2
-rw-r--r--testing/buildbot.yml26
2 files changed, 20 insertions, 8 deletions
diff --git a/testing/buildbot.hosts b/testing/buildbot.hosts
index 05614f6..3e0be7d 100644
--- a/testing/buildbot.hosts
+++ b/testing/buildbot.hosts
@@ -1 +1 @@
-localhost ansible_connection=local \ No newline at end of file
+localhost ansible_connection=local builder=xxx pass=xxx \ No newline at end of file
diff --git a/testing/buildbot.yml b/testing/buildbot.yml
index d68cc59..ee82343 100644
--- a/testing/buildbot.yml
+++ b/testing/buildbot.yml
@@ -1,9 +1,16 @@
-# Ansible playbook to setup buildbot instance
-# http://scons.org/wiki/InstallingBuildbotSlaves
+# Ansible playbook to setup buildbot instance.
+# Edit buildbot.hosts to set builder and pass variables.
+# Then exec:
+#
+# ansible-playbook -i buildbot.hosts buildbot.yml
#
-# ansible-playbook -i buildbot.hosts buildbot.yml -e 'botuser=scons'
+# botuser can be overridden from command line:
#
-# Tested with Ansible 1.5.0. Send questions to:
+# ansible-playbook -i hosts buildbot.yml -e 'botuser=sconsy'
+#
+# Tested with Ansible 1.5.0, based on
+# http://scons.org/wiki/InstallingBuildbotSlaves
+# Send questions to:
#
# anatoly techtonik <techtonik@gmail.com>
#
@@ -15,6 +22,7 @@
- botuser: scons
- hgrc: /home/{{ botuser }}/.hgrc
- venv: /home/{{ botuser }}/buildbot-virtualenv
+ - work: /home/{{ botuser }}/buildbot-workdir
tasks:
# --- install requirements ---
@@ -31,10 +39,14 @@
- file: path={{ hgrc }} owner={{ botuser }} state=touch
when: not st.stat.exists
- name: enable mercurial purge extension
- ini_file: dest={{ hgrc }} backup=yes
+ ini_file: dest={{ hgrc }}
section=extensions option=hgext.purge
value=
- # --- install buildbot ---
- name: install buildbot-slave in virtualenv
- pip: name=buildbot-slave virtualenv={{ venv }}
+ pip: name=buildbot-slave virtualenv={{ venv }}
+
+ - name: create buildbot environment
+ command: "{{ venv }}/bin/buildslave create-slave --relocatable
+ {{ work }} buildbot.scons.org:9989 {{ builder }} {{ pass }}
+ creates={{ work }}"