Two missing files from the packaging system patch, including the all-important packages.py. I suspect mbligh forgot to svn add them.

git-svn-id: svn://test.kernel.org/autotest/trunk@1963 592f7852-d20e-0410-864c-8624ca9c26a4

1 files changed, 206 insertions, 0 deletions

diff --git a/utils/packager.py b/utils/packager.py
new file mode 100644
index 00000000..77a4c9d1
--- /dev/null
+++ b/utils/packager.py
@@ -0,0 +1,206 @@
+#!/usr/bin/python -u
+
+"""
+Utility to upload or remove the packages from the packages repository.
+"""
+
+import os, sys, optparse, socket, tempfile, shutil
+import common
+from autotest_lib.client.common_lib import utils as client_utils
+from autotest_lib.client.common_lib import packages, global_config
+from autotest_lib.server import utils as server_utils
+
+c = global_config.global_config
+exclude_dirs = ['deps', 'tests', 'site_tests', 'profilers']
+
+def parse_args():
+    parser = optparse.OptionParser()
+    parser.add_option("-d", "--dependency", help="package the dependency"
+                      " from client/deps directory and upload to the repo",
+                      dest="dep")
+    parser.add_option("-p", "--profiler", help="package the profiler "
+                      "from client/profilers directory and upload to the repo",
+                      dest="prof")
+    parser.add_option("-t", "--test", help="package the test from client/tests"
+                      " or client/site_tests and upload to the repo.",
+                      dest="test")
+    parser.add_option("-c", "--client", help="package the client "
+                      "directory alone without the tests, deps and profilers",
+                      dest="client", action="store_true", default=False)
+    parser.add_option("-f", "--file", help="simply uploads the specified"
+                      "file on to the repo", dest="file")
+    parser.add_option("-r", "--repository", help="the URL of the packages"
+                      "repository location to upload the packages to.",
+                      dest="repo", default=None)
+    parser.add_option("--all", help="Upload all the files locally "
+                      "to all the repos specified in global_config.ini. "
+                      "(includes the client, tests, deps and profilers)",
+                      dest="all", action="store_true", default=False)
+
+    options, args = parser.parse_args()
+    return options, args
+
+
+# Method to upload or remove package depending on the flag passed to it.
+def process_packages(pkgmgr, pkg_type, pkg_names, src_dir, repo_url,
+                    remove=False):
+    names = [p.strip() for p in pkg_names.split(',')]
+    for name in names:
+        print "Processing %s ... " % name
+        if pkg_type=='client':
+            pkg_dir = src_dir
+        elif pkg_type=='test':
+            # if the package is a test then look whether it is in client/tests
+            # or client/site_tests
+            pkg_dir = os.path.join(get_test_dir(name, src_dir), name)
+        else:
+            # for the profilers and deps
+            pkg_dir = os.path.join(src_dir, name)
+
+        pkg_name = pkgmgr.get_tarball_name(name, pkg_type)
+        if not remove:
+            # Tar the source and upload
+            try:
+                temp_dir = tempfile.mkdtemp()
+                tarball_path = pkgmgr.tar_package(pkg_name, pkg_dir,
+                                                  temp_dir, exclude_dirs)
+                pkgmgr.upload_pkg(tarball_path, repo_url, update_checksum=True)
+            finally:
+                # remove the temporary directory
+                shutil.rmtree(temp_dir)
+        else:
+            pkgmgr.remove_pkg(pkg_name, repo_url, remove_checksum=True)
+        print "Done."
+
+
+def process_all_packages(pkgmgr, client_dir, repo_url, remove=False):
+    test_dir = os.path.join(client_dir, "tests")
+    site_test_dir = os.path.join(client_dir, "site_tests")
+    dep_dir = os.path.join(client_dir, "deps")
+    prof_dir = os.path.join(client_dir, "profilers")
+
+    # process client
+    process_packages(pkgmgr, 'client', 'autotest', client_dir, repo_url,
+                     remove=remove)
+
+    # process tests
+    tests_list = get_subdir_list('tests', client_dir)
+
+    tests = ','.join(tests_list)
+    process_packages(pkgmgr, 'test', tests, client_dir, repo_url,
+                     remove=remove)
+
+    # process site_tests
+    site_tests_list = get_subdir_list('site_tests', client_dir)
+
+    site_tests = ','.join(site_tests_list)
+    process_packages(pkgmgr, 'test', site_tests, client_dir, repo_url,
+                     remove=remove)
+
+    # process deps
+    deps_list = get_subdir_list('deps', client_dir)
+    deps = ','.join(deps_list)
+    process_packages(pkgmgr, 'dep', deps, dep_dir, repo_url, remove=remove)
+
+    # process profilers
+    profilers_list = get_subdir_list('profilers', client_dir)
+    profilers = ','.join(profilers_list)
+    process_packages(pkgmgr, 'profiler', profilers, prof_dir, repo_url,
+                     remove=remove)
+
+
+# Get the list of sub directories present in a directory
+def get_subdir_list(name, client_dir):
+    dir_name = os.path.join(client_dir, name)
+    return [f for f in
+            os.listdir(dir_name)
+            if os.path.isdir(os.path.join(dir_name, f)) ]
+
+
+# Look whether the test is present in client/tests and client/site_tests dirs
+def get_test_dir(name, client_dir):
+    names_test = os.listdir(os.path.join(client_dir, 'tests'))
+    names_site_test = os.listdir(os.path.join(client_dir, 'site_tests'))
+    if name in names_test:
+        src_dir = os.path.join(client_dir, 'tests')
+    elif name in names_site_test:
+        src_dir = os.path.join(client_dir, 'site_tests')
+    else:
+        print "Test %s not found" % name
+        sys.exit(0)
+    return src_dir
+
+
+# Given the name of the test the following function
+# returns the directory in which the test files are present
+# in (tests or site_tests)
+def main():
+    server_dir = server_utils.get_server_dir()
+    autotest_dir = os.path.abspath(os.path.join(server_dir, '..'))
+
+    # extract the pkg locations from global config
+    repo_urls = c.get_config_value('PACKAGES', 'fetch_location',
+                                   type=list, default=[])
+    upload_paths = c.get_config_value('PACKAGES', 'upload_location',
+                                      type=list, default=[])
+    # Having no upload paths basically means you're not using packaging.
+    if len(upload_paths) == 0:
+        return
+
+    pkgmgr = packages.PackageManager(autotest_dir, repo_urls,
+                                     upload_paths,
+                                     run_function_dargs={'timeout':600})
+
+    client_dir = os.path.join(autotest_dir, "client")
+
+    # Bail out if the client directory does not exist
+    if not os.path.exists(client_dir):
+        sys.exit(0)
+
+    dep_dir = os.path.join(client_dir, "deps")
+    prof_dir = os.path.join(client_dir, "profilers")
+
+    options, args = parse_args()
+
+    if len(args)==0 or args[0] not in ['upload','remove']:
+        print("Either 'upload' or 'remove' needs to be specified "
+              "for the package")
+        sys.exit(0)
+
+    if args[0]=='upload':
+        remove_flag=False
+    elif args[0]=='remove':
+        remove_flag=True
+    else:
+        # we should not be getting here
+        assert(False)
+
+    if options.all:
+        process_all_packages(pkgmgr, client_dir, options.repo,
+                             remove=remove_flag)
+
+    if options.client:
+        process_packages(pkgmgr, 'client', 'autotest', client_dir,
+                         options.repo, remove=remove_flag)
+
+    if options.dep:
+        process_packages(pkgmgr, 'dep', options.dep, dep_dir,
+                         options.repo, remove=remove_flag)
+
+    if options.test:
+        process_packages(pkgmgr, 'test', options.test, client_dir,
+                         options.repo, remove=remove_flag)
+
+    if options.prof:
+        process_packages(pkgmgr, 'profiler', options.prof, prof_dir,
+                         options.repo, remove=remove_flag)
+
+    if options.file:
+        if remove_flag:
+            pkgmgr.remove_pkg(options.file, options.repo, remove_checksum=True)
+        else:
+            pkgmgr.upload_pkg(options.file, options.repo, update_checksum=True)
+
+
+if __name__ == "__main__":
+    main()