Merge lp:~fboudra/linaro-license-protection/ubuntu-restricted-job-type into lp:~linaro-automation/linaro-license-protection/trunk

[Fathi Boudra]

Add ubuntu-restricted job type.

[Deepti B. Kalakeri (deeptik)]

Looks good.+1

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-05-01 10:08:32 +0000
+++ scripts/publish_to_snapshots.py	2012-05-02 18:36:17 +0000
@@ -30,6 +30,7 @@
     'kernel-hwpack',
     'ubuntu-hwpacks',
     'ubuntu-images',
+    'ubuntu-restricted',
     'ubuntu-sysroots',
     'binaries'
     ]
@@ -55,7 +56,8 @@
         elif args.job_type == "kernel-hwpack":
             ret_val = jobname.split('_')[0].replace(".", "_")
         elif args.job_type == "ubuntu-hwpacks" or \
-             args.job_type == "ubuntu-images" or \
+             args.job_type == "ubuntu-images" or\
+             args.job_type == "ubuntu-restricted" or\
              args.job_type == "ubuntu-sysroots":
             ret_val = jobname.split('-', 2)
         elif args.job_type == "prebuilt":
@@ -86,7 +88,8 @@
                                        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" or \
+                 args.job_type == "ubuntu-images" or\
+                 args.job_type == "ubuntu-restricted" or\
                  args.job_type == "ubuntu-sysroots":
                 dist_name = ret_val[0]
                 hwpack_image = args.job_type.split("-")[1]
@@ -218,6 +221,7 @@
             if args.job_type == "android" or\
                args.job_type == "ubuntu-hwpacks" or\
                args.job_type == "ubuntu-images" or\
+               args.job_type == "ubuntu-restricted" or\
                args.job_type == "ubuntu-sysroots":
                 ret = self.create_symlink(args, target_dir_path)
                 if ret != PASS:

=== modified file 'testing/test_publish_to_snapshots.py'
--- testing/test_publish_to_snapshots.py	2012-04-30 16:20:02 +0000
+++ testing/test_publish_to_snapshots.py	2012-05-02 18:36:17 +0000
@@ -56,6 +56,9 @@
         param = self.parser.parse_args(['-t', 'ubuntu-images', '-j', 'dummy_job_name',
                                         '-n', '1'])
         self.publisher.validate_args(param)
+        param = self.parser.parse_args(['-t', 'ubuntu-restricted', '-j', 'dummy_job_name',
+                                        '-n', '1'])
+        self.publisher.validate_args(param)
         param = self.parser.parse_args(['-t', 'ubuntu-sysroots', '-j', 'dummy_job_name',
                                         '-n', '1'])
         self.publisher.validate_args(param)
@@ -284,6 +287,31 @@
         stdout.seek(0)
         self.assertIn("Moved the files from", stdout.read())
 
+    def test_move_artifacts_ubuntu_restricted_successful_move(self):
+        orig_stdout = sys.stdout
+        stdout = sys.stdout = StringIO()
+        self.publisher = SnapshotsPublisher()
+        param = self.parser.parse_args(['-t', 'ubuntu-restricted', '-j',
+                                        'precise-armhf-integrated-big.little-fastmodels',
+                                        '-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)
+        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_sysroots_successful_move(self):
         orig_stdout = sys.stdout
         stdout = sys.stdout = StringIO()