Merge pull request #1378 from edx/han/cherrypick

Han/cherrypick

playbooks/roles/edxapp/defaults/main.yml

@@ -81,7 +81,7 @@ EDXAPP_FEATURES:
   ENABLE_INSTRUCTOR_ANALYTICS: true
   SUBDOMAIN_BRANDING: false
   SUBDOMAIN_COURSE_LISTINGS: false
-  PREVIEW_LMS_BASE: $EDXAPP_PREVIEW_LMS_BASE
+  PREVIEW_LMS_BASE: "{{ EDXAPP_PREVIEW_LMS_BASE }}"
   ENABLE_S3_GRADE_DOWNLOADS: true
   USE_CUSTOM_THEME: $edxapp_use_custom_theme
   AUTOMATIC_AUTH_FOR_TESTING: $EDXAPP_ENABLE_AUTO_AUTH
@@ -152,7 +152,7 @@ EDXAPP_CC_PROCESSOR:
 # does not affect verified students
 EDXAPP_PAID_COURSE_REGISTRATION_CURRENCY: ['usd', '$']
 
-# Configure rake tasks in edx-platform to skip Python/Ruby/Node installation
+# Configure paver tasks in edx-platform to skip Python/Ruby/Node installation
 EDXAPP_NO_PREREQ_INSTALL: 1
 
 # whether to setup the python codejail or not

playbooks/roles/edxapp/tasks/service_variant_config.yml

@@ -89,11 +89,11 @@
   - "restart edxapp"
   - "restart edxapp_workers"
 
-# Gather assets using rake if possible
+# Gather assets using paver if possible
 
-- name: gather {{ item }} static assets with rake
+- name: gather {{ item }} static assets with paver
   shell: >
-    SERVICE_VARIANT={{ item }} rake {{ item }}:gather_assets:aws
+    SERVICE_VARIANT={{ item }} paver update_assets {{ item }} --settings=aws
     executable=/bin/bash
     chdir={{ edxapp_code_dir }}
   sudo_user: "{{ edxapp_user }}"

playbooks/roles/jenkins_worker/meta/main.yml

@@ -4,3 +4,4 @@ dependencies:
     rbenv_user: "{{ jenkins_user }}"
     rbenv_dir: "{{ jenkins_home }}"
     rbenv_ruby_version: "{{ jenkins_ruby_version }}"
+    jenkins_worker: true

playbooks/roles/rbenv/tasks/main.yml

@@ -119,11 +119,13 @@
 
 - name: remove rbenv version of rake
   file: path="{{ rbenv_dir }}/.rbenv/versions/{{ rbenv_ruby_version }}/bin/rake" state=absent
+  when: jenkins_worker is not defined or not jenkins_worker
 
 - name: install rake gem
   shell: "gem install rake -v {{ rbenv_rake_version }}"
   sudo_user: "{{ rbenv_user }}"
   environment: "{{ rbenv_environment }}"
+  when: jenkins_worker is not defined or not jenkins_worker
 
 - name: rehash
   shell: "rbenv rehash"