Merge pull request #1517 from edx/release

Release

playbooks/edx-east/edx_continuous_integration.yml

@@ -24,8 +24,7 @@
     - mongo
     - { role: 'edxapp', celery_worker: True }
     - edxapp
-    - role: demo
-      tags: demo
+    - testcourses
     - { role: 'rabbitmq', rabbitmq_ip: '127.0.0.1' }
     - oraclejdk
     - elasticsearch

playbooks/edx-east/testcourses.yml

+- name: Create courses for testing
+  hosts: all
+  sudo: True
+  gather_facts: True
+  roles:
+    - testcourses
+    - role: datadog
+      when: COMMON_ENABLE_DATADOG
+    - role: splunkforwarder
+      when: COMMON_ENABLE_SPLUNKFORWARDER
+    - role: newrelic
+      when: COMMON_ENABLE_NEWRELIC

playbooks/roles/demo/defaults/main.yml

@@ -11,6 +11,8 @@
 # Defaults for role demo
 #
 
+DEMO_CREATE_STAFF_USER: true
+
 demo_app_dir: "{{ COMMON_APP_DIR }}/demo"
 demo_code_dir: "{{ demo_app_dir }}/edx-demo-course"
 demo_repo: "https://{{ COMMON_GIT_MIRROR }}/edx/edx-demo-course.git"

playbooks/roles/demo/tasks/deploy.yml

@@ -27,7 +27,9 @@
     {{ demo_edxapp_venv_bin }}/python ./manage.py lms --settings=aws --service-variant lms create_user -e staff@example.com -p edx -s -c {{ demo_course_id }}
     chdir={{ demo_edxapp_code_dir }}
   sudo_user: "{{ common_web_user }}"
-  when: demo_checkout.changed
+  when:
+    - demo_checkout.changed
+    - DEMO_CREATE_STAFF_USER
 
 - name: add test users to the certificate whitelist
   shell: >

playbooks/roles/testcourses/defaults/main.yml

+---
+#
+# edX Configuration
+#
+# github:     https://github.com/edx/configuration
+# wiki:       https://github.com/edx/configuration/wiki
+# code style: https://github.com/edx/configuration/wiki/Ansible-Coding-Conventions
+# license:    https://github.com/edx/configuration/blob/master/LICENSE.TXT
+#
+##
+# Defaults for role testcourses
+#
+TESTCOURSES_EXPORTS: []

playbooks/roles/testcourses/meta/main.yml

+---
+dependencies:
+  - demo

playbooks/roles/testcourses/tasks/deploy.yml

+---
+- name: create temporary directories
+  file: >
+    path=/var/tmp/{{ item.path|basename }}
+    state=directory
+  with_items: TESTCOURSES_EXPORTS
+  sudo_user: "{{ common_web_user }}"
+
+- name: Get the test courses
+  s3: >
+    bucket={{ item.bucket }}  object={{ item.path }}  dest=/var/tmp/{{ item.path|basename }}/{{ item.path|basename }} mode=get
+  with_items: TESTCOURSES_EXPORTS
+  sudo_user: "{{ common_web_user }}"
+
+- name: Untar the test courses
+  command: >
+    tar zxf {{ item.path|basename }}
+      chdir=/var/tmp/{{ item.path|basename }}
+  with_items: TESTCOURSES_EXPORTS
+  sudo_user: "{{ common_web_user }}"
+
+- name: import the test courses
+  shell: >
+    {{ demo_edxapp_venv_bin }}/python ./manage.py cms --settings=aws import {{ demo_edxapp_course_data_dir }} /var/tmp/{{ item.path|basename }}/{{ item.course_id.split('/')[2] }}
+    chdir={{ demo_edxapp_code_dir }}
+  sudo_user: "{{ common_web_user }}"
+  with_items: TESTCOURSES_EXPORTS
+
+- shell: >
+    chdir={{ demo_edxapp_code_dir }}
+    echo "from student.models import CourseEnrollment; from django.contrib.auth.models import User; from opaque_keys.edx.locations import SlashSeparatedCourseKey; course = SlashSeparatedCourseKey.from_deprecated_string('{{ item[0].course_id }}'); user = User.objects.get(email='{{ item[1].email }}'); CourseEnrollment.enroll(user, course, mode='{{ item[1].mode }}');" | {{ demo_edxapp_venv_bin }}/python ./manage.py lms shell --settings=aws
+  sudo_user: "{{ common_web_user }}"
+  with_nested:
+    - TESTCOURSES_EXPORTS
+    - demo_test_users

playbooks/roles/testcourses/tasks/main.yml

+---
+#
+# edX Configuration
+#
+# github:     https://github.com/edx/configuration
+# wiki:       https://github.com/edx/configuration/wiki
+# code style: https://github.com/edx/configuration/wiki/Ansible-Coding-Conventions
+# license:    https://github.com/edx/configuration/blob/master/LICENSE.TXT
+#
+#
+#
+# Tasks for role testcourses
+#
+# Overview:
+#
+#   Imports the testcourses course into studio
+#   https://github.com/edx/edx-testcourses-course
+#
+#   Once imported this role will only re-import the course
+#   if the edx-testcourses-course repo has been updated
+#
+# Dependencies:
+#   - common
+#   - edxapp
+#
+# Example play:
+#
+#   roles:
+#     - common
+#     - edxapp
+#     - testcourses
+
+- include: deploy.yml tags=deploy

util/jenkins/ansible-provision.sh

@@ -17,6 +17,7 @@
 # - dns_name
 # - environment
 # - name_tag
+set -x
 env
 export PYTHONUNBUFFERED=1
 export BOTO_CONFIG=/var/lib/jenkins/${aws_account}.boto
@@ -216,7 +217,7 @@ EOF
 fi
 
 declare -A deploy
-roles="edxapp forum xqueue xserver ora discern certs demo"
+roles="edxapp forum xqueue xserver ora discern certs demo testcourses"
 for role in $roles; do
     deploy[$role]=${!role}
 done

vagrant/release/devstack/Vagrantfile

@@ -43,8 +43,8 @@ end
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Creates an edX devstack VM from an official release
-  config.vm.box     = "johnnycake-devstack"
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20140625-johnnycake-devstack.box"
+  config.vm.box     = "kifli-devstack"
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140826-kifli-devstack.box"
 
   config.vm.network :private_network, ip: "192.168.33.10"
   config.vm.network :forwarded_port, guest: 8000, host: 8000
@@ -92,8 +92,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   ["vmware_fusion", "vmware_workstation"].each do |vmware_provider|
     config.vm.provider vmware_provider do |v, override|
-      override.vm.box     = "johnnycake-devstack-vmware"
-      override.vm.box_url = "http://files.edx.org/vagrant-images/20140630-johnnycake-devstack-vmware.box"
+      override.vm.box     = "kifli-devstack-vmware"
+      override.vm.box_url = "http://files.edx.org/vagrant-images/20140829-kifli-devstack-vmware.box"
       v.vmx["memsize"] = MEMORY.to_s
       v.vmx["numvcpus"] = CPU_COUNT.to_s
     end

vagrant/release/fullstack/Vagrantfile

@@ -8,8 +8,8 @@ CPU_COUNT = 2
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Creates an edX fullstack VM from an official release
-  config.vm.box     = "johnnycake-fullstack"
-  config.vm.box_url = "http://files.edx.org/vagrant-images/20140625-johnnycake-fullstack.box"
+  config.vm.box     = "kifli-fullstack"
+  config.vm.box_url = "http://files.edx.org/vagrant-images/20140826-kifli-fullstack.box"
 
   config.vm.synced_folder  ".", "/vagrant", disabled: true
   config.ssh.insert_key = true
@@ -28,8 +28,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   ["vmware_fusion", "vmware_workstation"].each do |vmware_provider|
     config.vm.provider vmware_provider do |v, override|
-      override.vm.box     = "johnnycake-fullstack-vmware"
-      override.vm.box_url = "http://files.edx.org/vagrant-images/20140630-johnnycake-fullstack-vmware.box"
+      override.vm.box     = "kifli-fullstack-vmware"
+      override.vm.box_url = "http://files.edx.org/vagrant-images/20140829-kifli-fullstack-vmware.box"
       v.vmx["memsize"] = MEMORY.to_s
       v.vmx["numvcpus"] = CPU_COUNT.to_s
     end