scripts/queue: common teuthology-queue command for paddles and beanst…

…alk queue

Signed-off-by: Aishwarya Mathuria <amathuri@redhat.com>

scripts/beanstalk_queue.py

@@ -1,7 +1,7 @@
 import docopt
 
 import teuthology.config
-import teuthology.beanstalk
+import teuthology.queue.beanstalk
 
 doc = """
 usage: teuthology-beanstalk-queue -h

scripts/paddles_queue.py

@@ -1,8 +1,7 @@
 import docopt
 
 import teuthology.config
-import teuthology.paddles_queue
-
+import teuthology.queue.paddles_queue
 doc = """
 usage: teuthology-paddles-queue -h
        teuthology-paddles-queue -s -m MACHINE_TYPE

scripts/queue.py

@@ -0,0 +1,37 @@
+import docopt
+
+import teuthology.config
+import teuthology.queue.beanstalk
+import teuthology.queue.paddles
+
+doc = """
+usage: teuthology-queue -h
+       teuthology-queue [-s|-d|-f] -m MACHINE_TYPE 
+       teuthology-queue [-r] -m MACHINE_TYPE
+       teuthology-queue -m MACHINE_TYPE -D PATTERN
+       teuthology-queue -p SECONDS [-m MACHINE_TYPE]
+
+List Jobs in queue.
+If -D is passed, then jobs with PATTERN in the job name are deleted from the
+queue.
+
+Arguments:
+  -m, --machine_type MACHINE_TYPE [default: multi]
+                        Which machine type queue to work on.
+
+optional arguments:
+  -h, --help            Show this help message and exit
+  -D, --delete PATTERN  Delete Jobs with PATTERN in their name
+  -d, --description     Show job descriptions
+  -r, --runs            Only show run names
+  -f, --full            Print the entire job config. Use with caution.
+  -s, --status          Prints the status of the queue
+  -p, --pause SECONDS   Pause queues for a number of seconds. A value of 0
+                        will unpause. If -m is passed, pause that queue,
+                        otherwise pause all queues.
+"""
+
+
+def main():
+    args = docopt.docopt(doc)
+    teuthology.queue.main(args)

teuthology/config.py

@@ -140,7 +140,7 @@ class TeuthologyConfig(YamlConfig):
         'archive_upload_key': None,
         'archive_upload_url': None,
         'automated_scheduling': False,
-        'backend': 'paddles',
+        'backend': 'beanstalk',
         'reserve_machines': 5,
         'ceph_git_base_url': 'https://github.com/ceph/',
         'ceph_git_url': None,

teuthology/dispatcher/__init__.py

@@ -8,7 +8,7 @@
 from time import sleep
 
 from teuthology import setup_log_file, install_except_hook
-from teuthology import beanstalk
+from teuthology.queue import beanstalk
 from teuthology import report
 from teuthology.config import config as teuth_config
 from teuthology.exceptions import SkipJob
@@ -73,11 +73,8 @@ def main(args):
     machine_type = args["--machine-type"]
     log_dir = args["--log-dir"]
     archive_dir = args["--archive-dir"]
-<<<<<<< HEAD
     exit_on_empty_queue = args["--exit-on-empty-queue"]
-=======
     backend = args['--queue-backend']
->>>>>>> 79c4d9bf... Add beanstalk as a possible queue backend for Teuthology Jobs along with Paddles
 
     if archive_dir is None:
         archive_dir = teuth_config.archive_base

teuthology/kill.py

@@ -8,7 +8,7 @@
 import logging
 import getpass
 
-from teuthology import beanstalk
+from teuthology.queue import beanstalk
 from teuthology import report
 from teuthology.config import config
 from teuthology import misc