Skip to content

Commit

Permalink
jenkins_generic_job: Add support for queue selection
Browse files Browse the repository at this point in the history
Just passes it down to create_test which already supports it.
  • Loading branch information
jgfouca committed Mar 8, 2023
1 parent 9333a6f commit ce1ff7d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
7 changes: 7 additions & 0 deletions CIME/Tools/jenkins_generic_job
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -250,6 +254,7 @@ OR
args.check_memory,
args.pes_file,
args.jenkins_id,
args.queue,
)


Expand Down Expand Up @@ -278,6 +283,7 @@ def _main_func(description):
check_memory,
pes_file,
jenkins_id,
queue,
) = parse_command_line(sys.argv, description)

sys.exit(
Expand All @@ -304,6 +310,7 @@ def _main_func(description):
check_memory,
pes_file,
jenkins_id,
queue,
)
else CIME.utils.TESTS_FAILED_ERR_CODE
)
Expand Down
4 changes: 4 additions & 0 deletions CIME/jenkins_generic_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ def jenkins_generic_job(
check_memory,
pes_file,
jenkins_id,
queue,
):
###############################################################################
"""
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit ce1ff7d

Please sign in to comment.