Merge pull request #2646 from edx/e0d/fix-edxapp

E0d/fix edxapp

.travis.yml

@@ -35,4 +35,4 @@ env:
 script:
   - docker --version
   - make --version
-  - make --keep-going $MAKE_TARGET SHARD=$SHARD SHARDS=$SHARDS
+  - travis_wait 30 make --keep-going $MAKE_TARGET SHARD=$SHARD SHARDS=$SHARDS

docker/build/edxapp/Dockerfile

+FROM edxops/precise-common:latest
+MAINTAINER edxops
+
+USER root
+RUN apt-get update
+
+ADD . /edx/app/edx_ansible/edx_ansible
+COPY docker/build/edxapp/ansible_overrides.yml /
+WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
+COPY docker/build/edxapp/ansible_overrides.yml /
+RUN /edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook edxapp.yml -i '127.0.0.1,' -c local -e "EDXAPP_PYTHON_SANDBOX=false" -t "install:base,install:configuration,install:app-requirements,install:code" -e@/ansible_overrides.yml
+WORKDIR /edx/app
+CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"]
+EXPOSE 8000 8010

docker/build/edxapp/ansible_overrides.ymml → docker/build/edxapp/ansible_overrides.yml

@@ -2,6 +2,9 @@
 
 DOCKER_TLD: "edx"
 
+# prevents Travis from giving up on the build
+COMMON_PIP_VERBOSITY: "-vvvv"
+
 EDXAPP_MYSQL_HOST: "db.{{ DOCKER_TLD }}"
 EDXAPP_MONGO_HOSTS:
-	- "mongo.{{ DOCKER_TLD }}"
\ No newline at end of file
+  - "mongo.{{ DOCKER_TLD }}"

docker/build/edxapp/xDockerfile

-FROM edxops/precise-common:latest
-MAINTAINER edxops
-
-ENV CONFIGURATION_REPO="https://github.com/edx/configuration.git"
-ENV CONFIGURATION_VERSION="hack2015/docker"
-
-USER docker
-
-RUN sudo apt-get update
-
-WORKDIR /edx/app/edx_ansible/edx_ansible
-RUN sudo git fetch --all
-RUN sudo git checkout ${CONFIGURATION_VERSION}
-RUN sudo git reset --hard origin/${CONFIGURATION_VERSION}
-RUN sudo git pull
-WORKDIR /edx/app/edx_ansible/edx_ansible/docker/plays
-COPY ansible_overrides.yml /
-
-RUN sudo ansible-playbook edxapp.yml -i '127.0.0.1,' -c local -e "EDXAPP_PYTHON_SANDBOX=false" -t "install:base,install:configuration,install:app-requirements,install:code" -e@/ansible_overrides.yml
-USER root
-WORKDIR /edx/app
-CMD ["/edx/app/supervisor/venvs/supervisor/bin/supervisord", "-n", "--configuration", "/edx/app/supervisor/supervisord.conf"]
-EXPOSE 8000 8010

playbooks/roles/common_vars/defaults/main.yml

@@ -39,6 +39,7 @@ common_directories:
     
 COMMON_ENVIRONMENT: 'default_env'
 COMMON_DEPLOYMENT: 'default_deployment'
+COMMON_PIP_VERBOSITY: ''
 COMMON_PYPI_MIRROR_URL: 'https://pypi.python.org/simple'
 COMMON_NPM_MIRROR_URL: 'http://registry.npmjs.org'
 COMMON_UBUNTU_APT_KEYSERVER: "http://keyserver.ubuntu.com/pks/lookup?op=get&fingerprint=on&search="

playbooks/roles/edxapp/tasks/deploy.yml

@@ -198,7 +198,7 @@
   # requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly
   # installs everything into that virtual environment.
   command: >
-    {{ edxapp_venv_dir }}/bin/pip install -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w -r {{ item.item }}
+    {{ edxapp_venv_dir }}/bin/pip install {{ COMMON_PIP_VERBOSITY }} -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w -r {{ item.item }}
     chdir={{ edxapp_code_dir }}
   sudo_user: "{{ edxapp_user }}"
   environment: "{{ edxapp_environment }}"
@@ -215,7 +215,7 @@
   # requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly
   # installs everything into that virtual environment.
   shell: >
-    {{ edxapp_venv_dir }}/bin/pip install -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w -r {{ item }}
+    {{ edxapp_venv_dir }}/bin/pip install {{ COMMON_PIP_VERBOSITY }} -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w -r {{ item }}
     chdir={{ edxapp_code_dir }}
   with_items:
   - "{{ private_requirements_file }}"
@@ -261,7 +261,7 @@
   # requirements are pathed relative to the edx-platform repo. Using the pip from inside the virtual environment implicitly
   # installs everything into that virtual environment.
   shell: >
-    {{ edxapp_venv_dir }}/bin/pip install -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w -r {{ item }}
+    {{ edxapp_venv_dir }}/bin/pip install {{ COMMON_PIP_VERBOSITY }} -i {{ COMMON_PYPI_MIRROR_URL }} --exists-action w -r {{ item }}
     chdir={{ edxapp_code_dir }}
   with_items:
   - "{{ sandbox_base_requirements }}"