Skip to content

Commit

Permalink
Merge pull request ESMCI#4510 from ESMCI/jenkins_add_ignore_namelists
Browse files Browse the repository at this point in the history
Add --ignore-namelists to Jenkins scripts

This is needed for performance tests launched by Jenkins scripts.

Test suite: CIME/Tools/jenkins_generic_job
Test baseline: n/a
Test namelist changes: none
Test status: bit for bit
User interface changes?: none
Update gh-pages html (Y/N)?: N
  • Loading branch information
jgfouca authored Nov 3, 2023
2 parents d9e5d3a + 06fa46a commit 403680a
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
9 changes: 9 additions & 0 deletions CIME/Tools/jenkins_generic_job
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,12 @@ OR
help="Do not fail if there are memleaks",
)

parser.add_argument(
"--ignore-namelists",
action="store_true",
help="Do not fail if there are namelist diffs",
)

parser.add_argument(
"--save-timing",
action="store_true",
Expand Down Expand Up @@ -265,6 +271,7 @@ OR
args.check_throughput,
args.check_memory,
args.ignore_memleak,
args.ignore_namelists,
args.save_timing,
args.pes_file,
args.jenkins_id,
Expand Down Expand Up @@ -296,6 +303,7 @@ def _main_func(description):
check_throughput,
check_memory,
ignore_memleak,
ignore_namelists,
save_timing,
pes_file,
jenkins_id,
Expand Down Expand Up @@ -325,6 +333,7 @@ def _main_func(description):
check_throughput,
check_memory,
ignore_memleak,
ignore_namelists,
save_timing,
pes_file,
jenkins_id,
Expand Down
3 changes: 2 additions & 1 deletion CIME/jenkins_generic_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ def jenkins_generic_job(
check_throughput,
check_memory,
ignore_memleak,
ignore_namelists,
save_timing,
pes_file,
jenkins_id,
Expand Down Expand Up @@ -421,7 +422,7 @@ def jenkins_generic_job(
no_wait=not use_batch, # wait if using queue
check_throughput=check_throughput,
check_memory=check_memory,
ignore_namelists=False, # don't ignore namelist diffs
ignore_namelists=ignore_namelists,
ignore_memleak=ignore_memleak,
cdash_build_name=cdash_build_name,
cdash_project=cdash_project,
Expand Down

0 comments on commit 403680a

Please sign in to comment.