Merge pull request #11 from indigo-dc/devel

Devel
indigo-dc · Aug 30, 2016 · 284da18 · 284da18
2 parents 1bf69f7 + a19c55b
commit 284da18
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -27,3 +27,4 @@ script:
 
 notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
+
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 [![License](http://img.shields.io/:license-apache-blue.svg?style=flat-square)](http://www.apache.org/licenses/LICENSE-2.0.html)
+[![Build Status](https://travis-ci.org/indigo-dc/ansible-role-disvis-powerfit.svg?branch=master)](https://travis-ci.org/indigo-dc/ansible-role-disvis-powerfit)
 
 Role and Dockerfile for disvis and powerfit application
 =======================================================

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -66,8 +66,13 @@
     - virtualenv
     - pyfftw
 
-- name: pip install pyopencl==2015.1
+- name: pip install pyopencl==2015.1 when disvis
   pip: name=pyopencl version=2015.1 state=present
+  when: haddock_app == "disvis"
+
+- name: pip install pyopencl when powerfit
+  pip: name=pyopencl
+  when: haddock_app == "powerfit"
 
 - name: pip install gpyfft
   pip: name="git+https://github.com/geggo/gpyfft.git" editable=false state=present

diff --git a/tests/test.yml b/tests/test.yml
@@ -2,3 +2,4 @@
 - hosts: localhost
   roles:
     - ansible-role-disvis-powerfit
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,3 +27,4 @@ script:

		notifications:
		webhooks: https://galaxy.ansible.com/api/v1/notifications/
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@
		- hosts: localhost
		roles:
		- ansible-role-disvis-powerfit