Merge lp:~gesha/linaro-license-protection/remove-artifacts-from-upload into lp:~linaro-automation/linaro-license-protection/trunk

[Georgy Redkozubov]

If BUILD-INFO.txt is not present among artifacts being published, we don't publish them. To avoid possible artifacts leakage with this branch we remove unpublished artifacts from upload dir.

[Paul Sokolovsky (pfalcon)]

<pfalcon> gesha: I wanted to ask before, what kind of error reporting this gets back to the user? Will jenkins job which does publishing for example will get something into its build log?
<pfalcon> gesha: because otherwise I may suggest for example instead of just removing all files and publishing nothing, publish a text file saying "nothing was published because of lack of BUILDINFO.txt, please add it"
<gesha> pfalcon, right now it shows only "BUILD-INFO.txt is not present in artifacts being published" but add info about nothing published is a good idea
<gesha> will add

[lp:~gesha/linaro-license-protection/remove-artifacts-from-upload]

159. By Georgy Redkozubov on 2013-01-30

Notify user that nothing was published

[Georgy Redkozubov (gesha)]

Added user notification.

[Paul Sokolovsky (pfalcon)]

looks good

review: Approve

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2013-01-29 16:08:02 +0000
+++ scripts/publish_to_snapshots.py	2013-01-30 11:31:21 +0000
@@ -397,7 +397,11 @@
             return FAIL
         ret = publisher.check_buildinfo(build_dir_path)
         if ret != PASS:
-            print "BUILD-INFO.txt is not present in artifacts being published"
+            print "BUILD-INFO.txt is not present in build."
+            print "WARNING: Nothing was published because BUILD-INFO.txt is absent."
+            # Remove artifacts from upload dir
+            if os.path.isdir(build_dir_path):
+                shutil.rmtree(build_dir_path)
             return FAIL
         ret = publisher.move_artifacts(args, build_dir_path, target_dir_path)
         if ret != PASS:

=== modified file 'tests/test_publish_to_snapshots.py'
--- tests/test_publish_to_snapshots.py	2013-01-29 16:08:02 +0000
+++ tests/test_publish_to_snapshots.py	2013-01-30 11:31:21 +0000
@@ -744,7 +744,7 @@
         file = open(file_name, "w")
         file.close()
 
-        self.assertEqual(PASS, self.publisher.check_buildinfo(build_dir))
+        self.assertEqual(PASS, self.publisher.check_buildinfo(build_path))
 
     def test_check_buildinfo_no_file(self):
         self.publisher = SnapshotsPublisher()
@@ -756,4 +756,4 @@
         build_path = os.path.join(self.uploads_path, build_dir)
         os.makedirs(build_path)
 
-        self.assertEqual(FAIL, self.publisher.check_buildinfo(build_dir))
+        self.assertEqual(FAIL, self.publisher.check_buildinfo(build_path))