Merge lp:~gesha/linaro-license-protection/check-build-info-on-publishing into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

This branch adds checks for BUILD-INFO.txt before publishing artifacts.
Build artifacts without proper protection with BUILD-INFO.txt shouldn't be published to prevent possible leaks.

[Paul Sokolovsky (pfalcon)]

Looks good.

review: Approve

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2013-01-01 23:57:40 +0000
+++ scripts/publish_to_snapshots.py	2013-01-29 16:12:28 +0000
@@ -15,6 +15,7 @@
 product_dir_path = 'target/product'
 PASS = 0
 FAIL = 1
+buildinfo = 'BUILD-INFO.txt'
 acceptable_job_types = [
     'android',
     'prebuilt',
@@ -367,6 +368,13 @@
             print "Failed to move files destination path", target_dir_path
             return FAIL
 
+    def check_buildinfo(self, build_dir_path):
+        buildinfo_path = os.path.join(build_dir_path, buildinfo)
+        if not os.path.exists(buildinfo_path):
+            return FAIL
+
+        return PASS
+
 
 def main():
     global uploads_path
@@ -387,6 +395,10 @@
         if build_dir_path is None or target_dir_path is None:
             print "Problem with build/target path, move failed"
             return FAIL
+        ret = publisher.check_buildinfo(build_dir_path)
+        if ret != PASS:
+            print "BUILD-INFO.txt is not present in artifacts being published"
+            return FAIL
         ret = publisher.move_artifacts(args, build_dir_path, target_dir_path)
         if ret != PASS:
             print "Move Failed"
 
=== modified file 'tests/test_publish_to_snapshots.py'
--- tests/test_publish_to_snapshots.py	2012-12-05 13:47:59 +0000
+++ tests/test_publish_to_snapshots.py	2013-01-29 16:12:28 +0000
@@ -11,6 +11,9 @@
     SnapshotsPublisher,
     setup_parser,
     product_dir_path,
+    FAIL,
+    PASS,
+    buildinfo
     )
 
 
@@ -726,3 +729,31 @@
         self.assertEqual(content, open(resulting_file).read())
         self.assertEqual(howto_content, open(resulting_howto_file).read())
         shutil.rmtree(source_dir)
+
+    def test_check_buildinfo(self):
+        self.publisher = SnapshotsPublisher()
+        param = self.parser.parse_args(
+            ['-t', 'prebuilt', '-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)
+
+        file_name = os.path.join(build_path, buildinfo)
+        file = open(file_name, "w")
+        file.close()
+
+        self.assertEqual(PASS, self.publisher.check_buildinfo(build_dir))
+
+    def test_check_buildinfo_no_file(self):
+        self.publisher = SnapshotsPublisher()
+        param = self.parser.parse_args(
+            ['-t', 'prebuilt', '-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)
+
+        self.assertEqual(FAIL, self.publisher.check_buildinfo(build_dir))