veda sandbox testing

instance_config.yaml

@@ -36,3 +36,5 @@ veda_token_url:
 rabbitmq_broker: ""
 rabbitmq_pass: ""
 rabbitmq_user: ""
+
+instance_prefix: ""

requirements.txt

@@ -4,4 +4,6 @@ nose==1.3.3
 requests==2.10.0
 celery==3.1.18
 newrelic
-git+https://github.com/yro/chunkey.git
+# TODO! https://openedx.atlassian.net/browse/EDUCATOR-2279
+# this way is required when installing using `pip install requirements.txt` so that `encode_profiles.json` is accessible
+-e git+https://github.com/yro/chunkey.git@14f9c330d4ba5a4290dd0d17429b142618bc2c9f#egg=chunkey

video_worker/__init__.py

@@ -31,6 +31,7 @@ except:
 
 boto.config.set('Boto', 'http_socket_timeout', '10')
 
+logging.basicConfig()
 logger = logging.getLogger(__name__)
 
 

video_worker/tests/data/test_instance_config.yaml

@@ -38,3 +38,5 @@ celery_deliver_queue: ""
 #--
 # Global settings
 global_timeout: 40
+
+instance_prefix: ""

video_worker/utils.py

@@ -23,7 +23,7 @@ def build_url(*urls, **query_params):
     Returns:
         absolute url
     """
-    url = '/'.join(item.strip('/') for item in urls)
+    url = '/'.join(item.strip('/') for item in urls if item)
     if query_params:
         url = '{}?{}'.format(url, urllib.urlencode(query_params))
 

video_worker/video_images.py

@@ -138,10 +138,17 @@ class VideoImages(object):
         for generated_image in generated_images:
             upload_key = Key(bucket)
             upload_key.key = build_url(
+                self.settings['instance_prefix'],
                 self.settings['aws_video_images_prefix'],
                 os.path.basename(generated_image)
             )
-            image_keys.append(upload_key.key)
+            # image path is stored in edxval without `instance_prefix`
+            image_keys.append(
+                build_url(
+                    self.settings['aws_video_images_prefix'],
+                    os.path.basename(generated_image)
+                )
+            )
             upload_key.set_contents_from_filename(generated_image)
             upload_key.set_acl('public-read')