Merge pull request #4368 from ESMCI/jgfouca/jenkins_add_queue_support

jenkins_generic_job: Add support for queue selection

Just passes it down to create_test which already supports it.

Test suite: by-hand, test_sys_jenkins...
Test baseline:
Test namelist changes:
Test status: bit for bit

User interface changes?:

Update gh-pages html (Y/N)?:

CIME/Tools/jenkins_generic_job

@@ -158,6 +158,10 @@ OR
         help="Compiler to use to build cime.  Default will be the default defined for the machine.",
     )
 
+    parser.add_argument(
+        "-q", "--queue", help="Force create_test to use a specific queue."
+    )
+
     parser.add_argument(
         "--check-throughput",
         action="store_true",
@@ -250,6 +254,7 @@ OR
         args.check_memory,
         args.pes_file,
         args.jenkins_id,
+        args.queue,
     )
 
 
@@ -278,6 +283,7 @@ def _main_func(description):
         check_memory,
         pes_file,
         jenkins_id,
+        queue,
     ) = parse_command_line(sys.argv, description)
 
     sys.exit(
@@ -304,6 +310,7 @@ def _main_func(description):
             check_memory,
             pes_file,
             jenkins_id,
+            queue,
         )
         else CIME.utils.TESTS_FAILED_ERR_CODE
     )

CIME/jenkins_generic_job.py

@@ -280,6 +280,7 @@ def jenkins_generic_job(
     check_memory,
     pes_file,
     jenkins_id,
+    queue,
 ):
     ###############################################################################
     """
@@ -367,6 +368,9 @@ def jenkins_generic_job(
     if pes_file is not None:
         create_test_args.append(" --pesfile " + pes_file)
 
+    if queue is not None:
+        create_test_args.append(" --queue " + queue)
+
     create_test_cmd = "./create_test " + " ".join(create_test_args)
 
     if not CIME.wait_for_tests.SIGNAL_RECEIVED: