[Plone-cvs] jenkins.plone.org/master: Make sure we run jenkins_node.yml only on the nodes, not on

[Timo S. <je...@pl...>]

Repository: jenkins.plone.org
Branch: refs/heads/master
Date: 2015-02-28T17:33:08+01:00
Author: Timo Stollenwerk (tisto) <ti...@pl...>
Commit: https://github.com/plone/jenkins.plone.org/commit/7dd172618c9a9f287fc4a5970b966902e9dd5239

Make sure we run jenkins_node.yml only on the nodes, not on the server.

Files changed:
M inventory.txt
M jenkins_node.yml

diff --git a/inventory.txt b/inventory.txt
index 9602fe3..c1bc76c 100644
--- a/inventory.txt
+++ b/inventory.txt
@@ -1,8 +1,10 @@
+[jenkins_nodes]
 node1.jenkins.plone.org
 node2.jenkins.plone.org
 node3.jenkins.plone.org
 node4.jenkins.plone.org
 
+[jenkins_server]
 jenkins.plone.org ansible_ssh_host=78.47.49.108
 
 local ansible_ssh_host=127.0.0.1 ansible_ssh_port=2222
diff --git a/jenkins_node.yml b/jenkins_node.yml
index 7ac2368..199fc0a 100644
--- a/jenkins_node.yml
+++ b/jenkins_node.yml
@@ -1,7 +1,7 @@
 ---
 # Playbook for Jenkins Slave on Ubuntu 14.04 LTS
 
-- hosts: all
+- hosts: jenkins_nodes
   remote_user: root
 
   tasks:
@@ -172,10 +172,14 @@
     # https://unix.stackexchange.com/questions/105265/install-pil-pillow-via-pip-in-debian-testing-jessie
     - name: freetype symlink
       file: src=/usr/include/freetype2 dest=/usr/include/freetype state=link
-    - name: fetch imaging source
-      get_url: url=http://effbot.org/downloads/Imaging-1.1.7.tar.gz dest=/tmp/
-    - name: unpack imaging tarball
-      command: tar zxf Imaging-1.1.7.tar.gz chdir=/tmp
-    - name: install imaging
-      command: python2.6 setup.py install chdir=/tmp/Imaging-1.1.7
+    - name: remove PIL for Python 2.7
+      shell: rm -rf /usr/local/lib/python2.7/dist-packages/PIL*
+    - name: remove PIL for Python 2.6
+      shell: rm -rf /usr/local/lib/python2.6/dist-packages/PIL*
+    #- name: fetch imaging source
+    #  get_url: url=http://effbot.org/downloads/Imaging-1.1.7.tar.gz dest=/tmp/
+    #- name: unpack imaging tarball
+    #  command: tar zxf Imaging-1.1.7.tar.gz chdir=/tmp
+    #- name: install imaging
+    #  command: python2.6 setup.py install chdir=/tmp/Imaging-1.1.7