From c2e7a6e6583d44b6af0fe33fd765a89ff14914da Mon Sep 17 00:00:00 2001
From: Ben Patterson <bpatterson@edx.org>
Date: Mon, 27 Oct 2014 21:03:02 -0400
Subject: [PATCH] Use curl instead of get_url
* Handles cert validation from behind a proxy better
* Also this commit updates build server validation (i.e. testcase
paths) that have changed on platform
---
playbooks/roles/jenkins_worker/tasks/packer.yml | 2 +-
playbooks/roles/test_build_server/files/test-development-environment.sh | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/playbooks/roles/jenkins_worker/tasks/packer.yml b/playbooks/roles/jenkins_worker/tasks/packer.yml
index 8f2298a..ce70042 100644
--- a/playbooks/roles/jenkins_worker/tasks/packer.yml
+++ b/playbooks/roles/jenkins_worker/tasks/packer.yml
@@ -1,6 +1,6 @@
---
- name: Download packer
- get_url: url={{ packer_url }} dest=/var/tmp/packer.zip
+ shell: "curl -L {{ packer_url }} -o /var/tmp/packer.zip"
- name: Unzip packer
unarchive: src=/var/tmp/packer.zip dest=/usr/local/bin copy=no
diff --git a/playbooks/roles/test_build_server/files/test-development-environment.sh b/playbooks/roles/test_build_server/files/test-development-environment.sh
index 782bf39..b3eabaf 100644
--- a/playbooks/roles/test_build_server/files/test-development-environment.sh
+++ b/playbooks/roles/test_build_server/files/test-development-environment.sh
@@ -35,10 +35,10 @@ paver test_system -t cms/djangoapps/course_creators/tests/test_views.py
paver test_js_run -s xmodule
# Run some of the bok-choy tests
-paver test_bokchoy -t test_lms.py:RegistrationTest
+paver test_bokchoy -t lms/test_lms.py:RegistrationTest
paver test_bokchoy -t discussion/test_discussion.py:DiscussionTabSingleThreadTest --fasttest
paver test_bokchoy -t studio/test_studio_with_ora_component.py:ORAComponentTest --fasttest
-paver test_bokchoy -t test_matlab_problem.py:MatlabProblemTest --fasttest
+paver test_bokchoy -t lms/test_lms_matlab_problem.py:MatlabProblemTest --fasttest
# Run some of the lettuce acceptance tests
paver test_acceptance -s lms --extra_args="lms/djangoapps/courseware/features/problems.feature -s 1"
--
libgit2 0.26.0