Merge lp:~gesha/linaro-license-protection/flatten-android-artifacts into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds support of reshuffling android artifacts. It does 'flattening' of 'target/product/<name>/*' directory, all entries from the '<name>' directory are moved to the top level directory (job id).

[Deepti B. Kalakeri (deeptik)]

Looks good. +1.

review: Approve

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-11-29 09:36:04 +0000
+++ scripts/publish_to_snapshots.py	2012-12-05 14:36:25 +0000
@@ -12,6 +12,7 @@
 target_path = '/srv/snapshots.linaro.org/www/'
 staging_uploads_path = '/srv/staging.snapshots.linaro.org/uploads/'
 staging_target_path = '/srv/staging.snapshots.linaro.org/www/'
+product_dir_path = 'target/product'
 PASS = 0
 FAIL = 1
 acceptable_job_types = [
@@ -263,6 +264,30 @@
             os.chdir(orig_dir)
             return FAIL
 
+    def reshuffle_android_artifacts(self, src_dir):
+        dst_dir = src_dir
+        full_product_path = os.path.join(src_dir, product_dir_path)
+        if os.path.isdir(full_product_path):
+            filelist = os.listdir(full_product_path)
+            try:
+                for file in filelist:
+                    src = os.path.join(full_product_path, file)
+                    if os.path.isdir(src):
+                        for artifact in os.listdir(src):
+                            dest = os.path.join(dst_dir, artifact)
+                            if os.path.exists(dest):
+                                if os.path.isdir(dest):
+                                    continue
+                                else:
+                                    os.remove(dest)
+                            shutil.move(os.path.join(src, artifact), dest)
+            except shutil.Error:
+                print "Error while reshuffling the content"
+            try:
+                shutil.rmtree(os.path.dirname(full_product_path))
+            except shutil.Error:
+                print "Error removing empty product dir"
+
     def move_dir_content(self, src_dir, dest_dir, sanitize=False):
         filelist = os.listdir(src_dir)
         try:
@@ -300,6 +325,9 @@
                 if not os.path.isdir(target_dir_path):
                     raise OSError
 
+            if (args.job_type == "android"):
+                self.reshuffle_android_artifacts(build_dir_path)
+
             self.move_dir_content(build_dir_path, target_dir_path,
                                   sanitize=args.staging)
 

=== modified file 'tests/test_publish_to_snapshots.py'
--- tests/test_publish_to_snapshots.py	2012-10-10 18:59:02 +0000
+++ tests/test_publish_to_snapshots.py	2012-12-05 14:36:25 +0000
@@ -10,6 +10,7 @@
     PublisherArgumentException,
     SnapshotsPublisher,
     setup_parser,
+    product_dir_path,
     )
 
 
@@ -696,3 +697,32 @@
         self.assertEqual(os.path.basename(artifact),
                          open(moved_artifact).read())
         self.assertIn("Moved the files from", stdout.read())
+
+    def test_flatten_android_artifacts(self):
+        source_dir = tempfile.mkdtemp()
+        full_product_path = os.path.join(source_dir, product_dir_path)
+        full_board_path = os.path.join(full_product_path, 'board')
+        full_howto_path = os.path.join(full_board_path, 'howto')
+        os.makedirs(full_howto_path)
+
+        content = "file_content"
+        file_name = os.path.join(full_board_path, "artifact.txt")
+        file = open(file_name, "w")
+        file.write(content)
+        file.close()
+
+        howto_content = "howto_file_content"
+        howto_file_name = os.path.join(full_howto_path, "HOWTO_install.txt")
+        file = open(howto_file_name, "w")
+        file.write(howto_content)
+        file.close()
+
+        publisher = SnapshotsPublisher()
+        publisher.reshuffle_android_artifacts(source_dir)
+        resulting_file = os.path.join(source_dir,
+                                      os.path.basename(file_name))
+        resulting_howto_file = os.path.join(source_dir, 'howto',
+                                      os.path.basename(howto_file_name))
+        self.assertEqual(content, open(resulting_file).read())
+        self.assertEqual(howto_content, open(resulting_howto_file).read())
+        shutil.rmtree(source_dir)