Merge pull request #1982 from edx/feanil/optional_post_reqs

Feanil/optional post reqs

playbooks/roles/edxapp/tasks/deploy.yml

@@ -127,6 +127,10 @@
   environment: "{{ edxapp_environment }}"
   sudo_user: "{{ edxapp_user }}"
 
+- stat: path="{{ post_requirements_file }}"
+  register: post_requirements
+  sudo_user: "{{ edxapp_user }}"
+
 # Install the python post requirements into {{ edxapp_venv_dir }}
 - name : install python post-requirements
   pip: >
@@ -136,6 +140,7 @@
     extra_args="-i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w"
   sudo_user: "{{ edxapp_user }}"
   environment: "{{ edxapp_environment }}"
+  when: post_requirements.stat.exists
 
 # Install the python paver requirements into {{ edxapp_venv_dir }}
 - name : install python paver-requirements

playbooks/roles/jenkins_worker/tasks/python.yml

@@ -58,10 +58,29 @@
     - pre.txt
     - github.txt
     - base.txt
-    - post.txt
     - paver.txt
   sudo_user: "{{ jenkins_user }}"
 
+
+# These and the pip install below it can be removed some time after
+# https://github.com/edx/edx-platform/pull/7465 has merged.
+# This will keep us from breaking after that gets merged.
+- stat: path="{{ jenkins_home }}/shallow-clone/requirements/edx/post.txt"
+  register: post_requirements
+  sudo_user: "{{ jenkins_user }}"
+
+- name: Install edx-platform post requirements using pip
+  pip: >
+    requirements={{ jenkins_home }}/shallow-clone/requirements/edx/{{ item }}
+    extra_args="--exists-action=w"
+    virtualenv={{ jenkins_home }}/edx-venv
+    virtualenv_command=virtualenv-2.7
+    executable=pip
+  with_items:
+    - post.txt
+  sudo_user: "{{ jenkins_user }}"
+  when: post_requirements.stat.exists
+
 # Archive the current state of the virtualenv
 # as a starting point for new builds.
 # The edx-venv directory is deleted and then recreated

util/jenkins/check-migrations.sh

@@ -18,7 +18,9 @@ cd "$WORKSPACE/edx-platform"
 
 pip install --exists-action w -r requirements/edx/pre.txt
 pip install --exists-action w -r requirements/edx/base.txt
-pip install --exists-action w -r requirements/edx/post.txt
+if [[ -f requiremnets/edx/post.txt ]]; then
+  pip install --exists-action w -r requirements/edx/post.txt
+fi
 pip install --exists-action w -r requirements/edx/repo.txt
 pip install --exists-action w -r requirements/edx/github.txt
 pip install --exists-action w -r requirements/edx/local.txt