Merge lp:~deeptik/linaro-license-protection/publish-to-snapshots into lp:~linaro-automation/linaro-license-protection/trunk

[Deepti B. Kalakeri]

Removing the -r kernel_tree option.
Using the build number in the kernel build path.
Using the jobname to use build the target and the uploads dir path.

[Paul Sokolovsky (pfalcon)]

This is an improvement, but I think all of 'if args.job_type == "android":' and 'elif args.job_type == "kernel-hwpack":' should be concentrated solely in jobname_to_target_subdir().

Good to go to solve immediate needs.

review: Approve

[lp:~deeptik/linaro-license-protection/publish-to-snapshots]

48. By Deepti B. Kalakeri on 2012-03-16

Removing the -r kernel_tree option. Using the build number in the kernel build path

=== modified file 'scripts/publish_to_snapshots.py'
--- scripts/publish_to_snapshots.py	2012-03-14 08:00:24 +0000
+++ scripts/publish_to_snapshots.py	2012-03-16 11:16:29 +0000
@@ -10,8 +10,6 @@
 parser = argparse.ArgumentParser()
 parser.add_argument("-t", "--job-type", dest="job_type",
                     help="Specify the job type (Ex: android/kernel-hwpack)")
-parser.add_argument("-r", "--ktree", dest="kernel_tree",
-                    help="Specify the kernel tree built by the job")
 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 andriod and for \
@@ -33,16 +31,9 @@
     def validate_args(self, args):
         # Validate that all the required information 
         # is passed on the command line
-        if (args.job_type == None or  args.job_name == None): 
-            parser.error("\nYou must specify job-type and job-name")
-            return FAIL
-
-        if (args.job_type == "android" and args.build_num == None):
-            parser.error("You must specify build number")
-            return FAIL
-
-        if (args.job_type == "kernel-hwpack" and args.kernel_tree == None):
-            parser.error("You must specify kernel tree name built by the job")
+        if (args.job_type == None or  args.job_name == None or \
+            args.build_num == None): 
+            parser.error("\nYou must specify job-type, job-name and build-num")
             return FAIL
 
         if (args.job_type not in acceptable_job_types):
@@ -53,27 +44,33 @@
         ret_val = None
         if args.job_type == "android":
             ret_val = jobname.split("_")    
+        elif args.job_type == "kernel-hwpack":
+            ret_val = jobname.split('_')[0].replace(".", "_")
         return ret_val 
 
     def validate_paths(self, args, uploads_path, target_path):
         build_dir_path = target_dir_path = None
-        if args.job_type == "android":
-           build_path = '/'.join([args.job_type, args.job_name,
-                                  str(args.build_num)])
-           build_dir_path = os.path.join(uploads_path, build_path) 
-           ret_val = self.jobname_to_target_subdir(args, args.job_name)
-           if ret_val != None:
-               user_name = ret_val[0]
-               job_name = '_'.join(ret_val[1:])
-               target_dir = '/'.join([args.job_type, user_name, job_name,
+        ret_val = self.jobname_to_target_subdir(args, args.job_name)
+        if ret_val != None:
+            if args.job_type == "android":
+                build_path = '/'.join([args.job_type, args.job_name,
                                       str(args.build_num)])
-               target_dir_path = os.path.join(target_path, target_dir)
-           else:
-               return None, None
+                build_dir_path = os.path.join(uploads_path, build_path) 
+                user_name = ret_val[0]
+                job_name = '_'.join(ret_val[1:])
+                target_dir = '/'.join([args.job_type, user_name, job_name,
+                                       str(args.build_num)])
+                target_dir_path = os.path.join(target_path, target_dir)
+            elif args.job_type == "kernel-hwpack":
+                kernel_tree = ret_val
+                build_path = '/'.join([args.job_type, args.job_name, 
+                                       str(args.build_num)])
+                build_dir_path = os.path.join(uploads_path, build_path)
+                target_dir = '/'.join([args.job_type, kernel_tree, 
+                                       args.job_name])
+                target_dir_path = os.path.join(target_path, target_dir)
         else:
-           build_path = '/'.join([args.job_type, args.kernel_tree, args.job_name])
-           build_dir_path = os.path.join(uploads_path, build_path)
-           target_dir_path = os.path.join(target_path, build_path)
+            return None, None
 
         if not (os.path.isdir(uploads_path) or os.path.isdir(build_dir_path)):
             build_paths = "'%s' or '%s'" % (uploads_path, build_dir_path)

=== modified file 'testing/test_publish_to_snapshots.py'
--- testing/test_publish_to_snapshots.py	2012-03-14 08:00:24 +0000
+++ testing/test_publish_to_snapshots.py	2012-03-16 11:16:29 +0000
@@ -18,7 +18,6 @@
     def setUp(self):
         self.parser =  argparse.ArgumentParser()
         self.parser.add_argument("-t", "--job-type", dest="job_type")
-        self.parser.add_argument("-r", "--ktree", dest="kernel_tree")
         self.parser.add_argument("-j", "--job-name", dest="job_name")
         self.parser.add_argument("-n", "--build-num", dest="build_num", type=int)
         if not os.path.isdir(self.uploads_path):
@@ -38,10 +37,11 @@
 
     def test_validate_args_valid_job_values(self):
         self.publisher = SnapshotsPublisher()
-        param = self.parser.parse_args(['-t', 'android', '-j', 'dummy_job_name', '-n', '1'])
+        param = self.parser.parse_args(['-t', 'android', '-j', 'dummy_job_name', 
+                                        '-n', '1'])
         self.publisher.validate_args(param)
-        param = self.parser.parse_args(['-t', 'kernel-hwpack', '-r', 'dummy_tree', 
-                                        '-j', 'dummy_job_name'])
+        param = self.parser.parse_args(['-t', 'kernel-hwpack', '-j', 'dummy_job_name', 
+                                        '-n', '1'])
         self.publisher.validate_args(param)
 
     def test_validate_args_invalid_job_type(self):
@@ -94,15 +94,14 @@
         stderr = sys.stderr = StringIO()
         self.publisher = SnapshotsPublisher()
         try:
-            param = self.parser.parse_args(['-t', None , '-r', None,  
-                                            '-j', None , '-n' , 0])
+            param = self.parser.parse_args(['-t', None , '-j', None , '-n' , 0])
             self.publisher.validate_args(param)
         except SystemExit, err:
             self.assertEqual(err.code, 2, "None values are not acceptable")
         finally:
             sys.stderr = orig_stderr
         stderr.seek(0)
-        self.assertIn("You must specify job-type and job-name", 
+        self.assertIn("You must specify job-type, job-name and build-num", 
                       stderr.read())
 
     def test_validate_paths_invalid_uploads_path(self):
@@ -131,8 +130,7 @@
         self.publisher.validate_args(param)
         self.target_path = "./dummy_target_path"
         try:
-            self.publisher.validate_paths(param, self.uploads_path, 
-                                                        self.target_path)
+            self.publisher.validate_paths(param, self.uploads_path, self.target_path)
         finally:
             sys.stdout = orig_stdout
         stdout.seek(0)
@@ -143,10 +141,10 @@
         stdout = sys.stdout = StringIO()
         self.publisher = SnapshotsPublisher()
         param = self.parser.parse_args(['-t', 'kernel-hwpack', '-j', 'dummy_job_name', 
-                                        '-r', 'dummy_kernel_tree'])
+                                        '-n', '1'])
         self.publisher.validate_args(param)
-        build_path = os.path.join(self.uploads_path, param.job_type, param.kernel_tree, 
-                                  param.job_name)
+        build_path = os.path.join(self.uploads_path, param.job_type, param.job_name,
+                                  str(param.build_num))
         os.makedirs(build_path)
         tempfiles = tempfile.mkstemp(dir=build_path)
         try: