Merge lp:~fboudra/linaro-license-protection/openembedded-support-lp1032134 into lp:~linaro-automation/linaro-license-protection/trunk

[Fathi Boudra]

Add openembedded job type to publish sources and sstate-cache (LP: #1032134)

Add openembedded job type to publish sources and sstate-cache (LP: #1032134)

[Georgy Redkozubov (gesha)]

Looks good.
If Marcin agreed on Ubuntu-like path go ahead and merge it, otherwise pls fix it.

review: Approve

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-05-17 19:13:54 +0000
+++ scripts/publish_to_snapshots.py	2012-08-03 10:42:18 +0000
@@ -34,6 +34,7 @@
     'ubuntu-images',
     'ubuntu-restricted',
     'ubuntu-sysroots',
+    'openembedded',
     'binaries'
     ]
 
@@ -64,6 +65,8 @@
               args.job_type == "ubuntu-restricted" or
               args.job_type == "ubuntu-sysroots"):
             ret_val = jobname.split('-', 2)
+        elif args.job_type == "openembedded":
+            ret_val = jobname.split('-', 2)
         elif args.job_type == "prebuilt":
             # Return value must not be None when we want to ignore it.
             ret_val = ''
@@ -105,6 +108,13 @@
                     [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 == "openembedded":
+                build_dir_path = os.path.join(uploads_path,
+                                              args.job_type,
+                                              args.job_name)
+                target_dir_path = os.path.join(target_path,
+                                              args.job_type,
+                                              args.job_name)
             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)

=== modified file 'tests/test_publish_to_snapshots.py'
--- tests/test_publish_to_snapshots.py	2012-07-11 11:56:10 +0000
+++ tests/test_publish_to_snapshots.py	2012-08-03 10:42:18 +0000
@@ -66,6 +66,9 @@
             ['-t', 'ubuntu-sysroots', '-j', 'dummy_job_name', '-n', '1'])
         self.publisher.validate_args(param)
         param = self.parser.parse_args(
+            ['-t', 'openembedded', '-j', 'dummy_job_name', '-n', '1'])
+        self.publisher.validate_args(param)
+        param = self.parser.parse_args(
             ['-t', 'binaries', '-j', 'dummy_job_name', '-n', '1'])
         self.publisher.validate_args(param)
 
@@ -353,6 +356,33 @@
         stdout.seek(0)
         self.assertIn("Moved the files from", stdout.read())
 
+    def test_move_artifacts_openembedded_successful_move(self):
+        orig_stdout = sys.stdout
+        stdout = sys.stdout = StringIO()
+        self.publisher = SnapshotsPublisher()
+        param = self.parser.parse_args(['-t', 'openembedded',
+                                        '-j', 'sources',
+                                        '-n', '1'])
+        self.publisher.validate_args(param)
+        build_path = os.path.join(self.uploads_path,
+                                  param.job_type,
+                                  param.job_name)
+        os.makedirs(build_path)
+        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_binaries_successful_move(self):
         orig_stdout = sys.stdout
         stdout = sys.stdout = StringIO()