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

[Fathi Boudra]

Add ubuntu-sysroots job type. (LP: #987234)

[Deepti B. Kalakeri (deeptik)]

Looks good.
+1

Thanks!!!
Deepti.

review: Approve

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-04-24 10:41:13 +0000
+++ scripts/publish_to_snapshots.py	2012-04-24 13:25:36 +0000
@@ -11,10 +11,10 @@
                     help="Specify the job type (Ex: android/kernel-hwpack)")
 parser.add_argument("-j", "--job-name", dest="job_name",
                     help="Specify the job name which resulted the archive to be stored.\
-                    Ex: ${JOB_NAME} should be specified for android/ubuntu-hwpacks/ubuntu-images/binaries and for \
+                    Ex: ${JOB_NAME} should be specified for android/ubuntu-hwpacks/ubuntu-images/ubuntu-sysroots/binaries and for \
                     kernel-hwpack ${KERNEL_JOB_NAME}")
 parser.add_argument("-n", "--build-num", dest="build_num", type=int,
-                    help="Specify the job build number for android/ubuntu-hwpacks/ubuntu-images/binaries")
+                    help="Specify the job build number for android/ubuntu-hwpacks/ubuntu-images/ubuntu-sysroots/binaries")
 parser.add_argument("-m", "--manifest", dest="manifest", action='store_true',
                     help="Optional parameter to generate MANIFEST file")
 
@@ -28,6 +28,7 @@
     'kernel-hwpack',
     'ubuntu-hwpacks',
     'ubuntu-images',
+    'ubuntu-sysroots',
     'binaries'
     ]
 
@@ -52,7 +53,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":
+             args.job_type == "ubuntu-images" or \
+             args.job_type == "ubuntu-sysroots":
             ret_val = jobname.split('-', 2)
         elif args.job_type == "prebuilt":
             ret_val = '' #just need non-null since its isn't needed
@@ -82,7 +84,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":
+                 args.job_type == "ubuntu-images" or \
+                 args.job_type == "ubuntu-sysroots":
                 dist_name = ret_val[0]
                 hwpack_image = args.job_type.split("-")[1]
                 board_rootfs_name = ret_val[2]

=== modified file 'testing/test_publish_to_snapshots.py'
--- testing/test_publish_to_snapshots.py	2012-04-18 08:12:36 +0000
+++ testing/test_publish_to_snapshots.py	2012-04-24 13:25:36 +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-sysroots', '-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)
@@ -281,6 +284,30 @@
         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()
+        self.publisher = SnapshotsPublisher()
+        param = self.parser.parse_args(['-t', 'ubuntu-sysroots', '-j',
+                                        'precise-armhf-ubuntu-desktop-dev', '-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_binaries_successful_move(self):
         orig_stdout = sys.stdout
         stdout = sys.stdout = StringIO()