Merge lp:~deeptik/linaro-license-protection/fixing_bug_955813 into lp:~linaro-automation/linaro-license-protection/trunk

[Deepti B. Kalakeri]

Images/hwpacks from https://ci.linaro.org/jenkins/view/Ubuntu Build Service/ should be published on snapshots.linaro.org. The changes push the hwpacks from /srv3/snapshots.linaro.org/uploads/precise-armhf-nano/1 to /srv3/snapshots.linaro.org/www/precise/images/nano/1 and addresses the bug 955813.

[Fathi Boudra (fboudra)]

Ship it!

review: Approve

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-03-28 16:38:32 +0000
+++ scripts/publish_to_snapshots.py	2012-04-06 19:36:19 +0000
@@ -25,8 +25,10 @@
 FAIL = 1
 acceptable_job_types = [
     'android',
+    'prebuilt',
     'kernel-hwpack',
-    'prebuilt'
+    'ubuntu-hwpacks',
+    'ubuntu-images'
     ]
 
 class SnapshotsPublisher(object):
@@ -49,6 +51,9 @@
             ret_val = jobname.split("_")    
         elif args.job_type == "kernel-hwpack":
             ret_val = jobname.split('_')[0].replace(".", "_")
+        elif args.job_type == "ubuntu-hwpacks" or \
+             args.job_type == "ubuntu-images":
+            ret_val = jobname.split('-', 2)
         elif args.job_type == "prebuilt":
             ret_val = '' #just need non-null since its isn't needed
         return ret_val
@@ -74,6 +79,16 @@
                 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 == "ubuntu-hwpacks" or \
+                 args.job_type == "ubuntu-images":
+                dist_name = ret_val[0]
+                hwpack_image = args.job_type.split("-")[1]
+                board_rootfs_name = ret_val[2]
+                build_dir_path = os.path.join(uploads_path, args.job_name, 
+                                              str(args.build_num))
+                target_dir = '/'.join([dist_name, hwpack_image, 
+                                       board_rootfs_name, str(args.build_num)])
+                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)
@@ -149,6 +164,7 @@
                         continue
                     else:
                         os.remove(dest)
+                print "Moving the src '", src, "'to dest'", dest, "'"
                 shutil.move(src, dest)
         except shutil.Error:
             print "Error while moving the content"
@@ -189,18 +205,21 @@
     publisher = SnapshotsPublisher()
     args = parser.parse_args()
     publisher.validate_args(args)
-    build_dir_path, target_dir_path = publisher.validate_paths(args, uploads_path, 
-                                                               target_path)
-    if build_dir_path == None or target_dir_path == None:
-        print "Problem with build/target path, move failed"
-        return FAIL
-
-    ret  = publisher.move_artifacts(args, build_dir_path, target_dir_path)
-    if ret != PASS:
-        print "Move Failed"
-        return FAIL
-    else:
-        print "Move succeeded"
-        return PASS
+    try:
+        build_dir_path, target_dir_path = publisher.validate_paths(args, uploads_path, 
+                                                                   target_path)
+        if build_dir_path == None or target_dir_path == None:
+            print "Problem with build/target path, move failed"
+            return FAIL
+        ret  = publisher.move_artifacts(args, build_dir_path, target_dir_path)
+        if ret != PASS:
+            print "Move Failed"
+            return FAIL
+        else:
+            print "Move succeeded"
+            return PASS
+    except Exception, details:
+        print "In main() Exception details:", details
+        return FAIL
 if __name__ == '__main__':
     sys.exit(main())

=== modified file 'testing/test_publish_to_snapshots.py'
--- testing/test_publish_to_snapshots.py	2012-03-28 19:47:42 +0000
+++ testing/test_publish_to_snapshots.py	2012-04-06 19:36:19 +0000
@@ -216,6 +216,79 @@
         stdout.seek(0)
         self.assertIn("Moved the files from", stdout.read())
 
+    def test_move_artifacts_ubuntu_hwpacks_successful_move(self):
+        orig_stdout = sys.stdout
+        stdout = sys.stdout = StringIO()
+        self.publisher = SnapshotsPublisher()
+        param = self.parser.parse_args(['-t', 'ubuntu-hwpacks', '-j', 
+                                        'precise-armhf-lt-panda', '-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)
+        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)
+            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())
+
+    def test_move_artifacts_ubuntu_images_successful_move(self):
+        orig_stdout = sys.stdout
+        stdout = sys.stdout = StringIO()
+        self.publisher = SnapshotsPublisher()
+        param = self.parser.parse_args(['-t', 'ubuntu-images', '-j', 
+                                        'precise-armhf-ubuntu-desktop', '-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)
+        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)
+            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())
+
+
+    def test_move_artifacts_android_successful_move(self):
+        orig_stdout = sys.stdout
+        stdout = sys.stdout = StringIO()
+        self.publisher = SnapshotsPublisher()
+        param = self.parser.parse_args(['-t', 'android', '-j', 'dummy_job_name', 
+                                        '-n', '1'])
+        self.publisher.validate_args(param)
+        build_dir = '/'.join([param.job_type, param.job_name, str(param.build_num)])
+        build_path = os.path.join(self.uploads_path, build_dir)
+        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)
+            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())
+
     def test_create_symlink(self):
         orig_stdout = sys.stdout
         stdout = sys.stdout = StringIO()