Merge lp:~doanac/linaro-license-protection/prebuilt-support into lp:~linaro-automation/linaro-license-protection/trunk

[Andy Doan]

This allows pre-built images to be published

[Andy Doan (doanac)]

found a small bug. I need to fix before this can be merged.

[lp:~doanac/linaro-license-protection/prebuilt-support]

51. By Andy Doan on 2012-03-28

fix layout issue for prebuilt

The original commit for pre-built layouts assumed jenkins could
pass something like 20120328. This isn't known by jenkins so we
instead change the layout to use jobname and build number.

[Andy Doan (doanac)]

> found a small bug. I need to fix before this can be merged.
Its been fixed by commit 51. Code is ready for review again.

[Guilherme Salgado (salgado)]

It looks reasonable to me. Can you add a test for it in testing/test_publish_to_snapshots.py? From what I can tell it should be easy but if it turns out to be tricky we can file a bug to have one added later.

review: Approve

[lp:~doanac/linaro-license-protection/prebuilt-support]

52. By Andy Doan on 2012-03-28

add test code for prebuilt

[Andy Doan (doanac)]

On 03/28/2012 01:07 PM, Guilherme Salgado wrote:
> Review: Approve
>
> It looks reasonable to me. Can you add a test for it in testing/test_publish_to_snapshots.py? From what I can tell it should be easy but if it turns out to be tricky we can file a bug to have one added later.

test case added.

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-03-26 10:45:51 +0000
+++ scripts/publish_to_snapshots.py	2012-03-28 19:50:23 +0000
@@ -26,6 +26,7 @@
 acceptable_job_types = [
     'android',
     'kernel-hwpack',
+    'prebuilt'
     ]
 
 class SnapshotsPublisher(object):
@@ -48,7 +49,9 @@
             ret_val = jobname.split("_")    
         elif args.job_type == "kernel-hwpack":
             ret_val = jobname.split('_')[0].replace(".", "_")
-        return ret_val 
+        elif args.job_type == "prebuilt":
+            ret_val = '' #just need non-null since its isn't needed
+        return ret_val
 
     def validate_paths(self, args, uploads_path, target_path):
         build_dir_path = target_dir_path = None
@@ -71,6 +74,10 @@
                 target_dir = '/'.join([args.job_type, kernel_tree, 
                                        args.job_name])
                 target_dir_path = os.path.join(target_path, target_dir)
+            elif args.job_type == "prebuilt":
+                build_path = '%s/%d' % (args.job_name, args.build_num)
+                build_dir_path = os.path.join(uploads_path, build_path)
+                target_dir_path = target_path
         else:
             return None, None
 
@@ -155,7 +162,7 @@
 
             self.move_dir_content(build_dir_path, target_dir_path)
 
-            if args.job_type != "kernel-hwpack":
+            if args.job_type == "android":
                 ret = self.create_symlink(target_dir_path)
                 if ret != PASS:
                     return ret

=== modified file 'testing/test_publish_to_snapshots.py'
--- testing/test_publish_to_snapshots.py	2012-03-26 11:27:06 +0000
+++ testing/test_publish_to_snapshots.py	2012-03-28 19:50:23 +0000
@@ -47,6 +47,10 @@
                                         '-n', '1'])
         self.publisher.validate_args(param)
 
+        param = self.parser.parse_args(['-t', 'prebuilt', '-j', 'dummy_job_name',
+                                        '-n', '1'])
+        self.publisher.validate_args(param)
+
     def test_validate_args_invalid_job_type(self):
         orig_stderr = sys.stderr
         stderr = sys.stderr = StringIO()
@@ -183,7 +187,32 @@
         finally:
             sys.stdout = orig_stdout
             pass
-         
+   
+        stdout.seek(0)
+        self.assertIn("Moved the files from", stdout.read())
+
+    def test_move_artifacts_prebuilt_successful_move(self):
+        orig_stdout = sys.stdout
+        stdout = sys.stdout = StringIO()
+        self.publisher = SnapshotsPublisher()
+        param = self.parser.parse_args(['-t', 'prebuilt', '-j', 'dummy_job_name',
+                                        '-n', '1'])
+        self.publisher.validate_args(param)
+        build_dir = '/'.join([param.job_name, str(param.build_num)])
+        build_path = os.path.join(self.uploads_path, build_dir,'oneiric')
+        os.makedirs(build_path)
+        tempfiles = tempfile.mkstemp(dir=build_path)
+        try:
+            uploads_dir_path, target_dir_path = self.publisher.validate_paths(param,
+                                                self.uploads_path, self.target_path)
+            uploads_dir_path = os.path.join(self.orig_dir, uploads_dir_path)
+            target_dir_path = os.path.join(self.orig_dir, target_dir_path)
+            orig_stdout.write("andy: (%s) (%s)\n" % (uploads_dir_path, target_dir_path))
+            self.publisher.move_artifacts(param, uploads_dir_path, target_dir_path)
+        finally:
+            sys.stdout = orig_stdout
+            pass
+
         stdout.seek(0)
         self.assertIn("Moved the files from", stdout.read())