Merge pull request #1738 from edx/benp/add-libjpeg

Use common packages between edxlocal and edxapp.

playbooks/roles/edxapp/defaults/main.yml

@@ -773,20 +773,13 @@ edxapp_chrislea_ppa: "ppa:chris-lea/node.js"
 edxapp_debian_pkgs:
   # for compiling the virtualenv
   # (only needed if wheel files aren't available)
-  - build-essential
   - s3cmd
   - pkg-config
   - graphviz-dev
-  - graphviz
-  - libmysqlclient-dev
   # for scipy, do not install
   # libopenblas-base, it will cause
   # problems for numpy
-  - gfortran
-  - liblapack-dev
   - g++
-  - libxml2-dev
-  - libxslt1-dev
   # apparmor
   - apparmor-utils
   # misc
@@ -794,14 +787,6 @@ edxapp_debian_pkgs:
   - ipython
   - nodejs
   - ntp
-  # for shapely
-  - libgeos-dev
-  # i18n
-  - gettext
-  # Pillow (PIL Fork) Dependencies
-  # Needed by the CMS to manipulate images.
-  - libjpeg8-dev
-  - libpng12-dev
   # matplotlib needs libfreetype6-dev
   - libfreetype6-dev
 

playbooks/roles/edxapp/meta/main.yml

 ---
 dependencies:
+  - edxapp_common
   - supervisor
   - role: rbenv
     rbenv_user: "{{ edxapp_user }}"

playbooks/roles/edxapp_common/defaults/main.yml

+---
+# Base role for installing requirements common between edxapp and edxlocal
+
+edxapp_common_role_name: edxapp_common
+
+# OS packages
+edxapp_common_debian_pkgs:
+    - build-essential
+    - gfortran
+    - graphviz
+    - liblapack-dev
+    - libmysqlclient-dev
+    - libxml2-dev
+    # for shapely
+    - libgeos-dev
+    - libxslt1-dev
+    # for 18n
+    - gettext
+    # Pillow (PIL Fork) Dependencies
+    # Needed by the CMS to manipulate images.
+    - libjpeg8-dev
+    - libpng12-dev

playbooks/roles/edxapp_common/tasks/main.yml

+---
+
+- name: Install system packages
+  apt: pkg={{','.join(edxapp_common_debian_pkgs)}}
+       state=present update_cache=yes

playbooks/roles/jenkins_worker/defaults/main.yml

@@ -8,19 +8,8 @@ jenkins_chrislea_ppa: "ppa:chris-lea/node.js"
 
 # System packages
 jenkins_debian_pkgs:
-    - build-essential
-    - gfortran
-    - graphviz
-    - libgraphviz-dev
-    - libopenblas-dev
-    - liblapack-dev
-    - libmysqlclient-dev
-    - libxml2-dev
-    - libgeos-dev
-    - libxslt1-dev
     - nodejs
     - pkg-config
-    - gettext
 
 # Ruby Specific Vars
 jenkins_rbenv_root: "{{ jenkins_home }}/.rbenv"