Skip to content

Commit

Permalink
[release/public-v2.2.0] Fix crontab bug for Cheyenne and Derecho, upd…
Browse files Browse the repository at this point in the history
…ate PR template for new platforms (#939)

The option to create an experiment with the option USE_CRON_TO_RELAUNCH=True is currently broken on Cheyenne and Derecho due to some bad python logic. This fixes that issue.

Also took the opportunity to update the PR template to include the new supported platforms (Derecho, Hercules, and Gaea C5)

Contains an additional fix for removing old crontab entries on Cheyenne and Derecho
  • Loading branch information
mkavulich authored Oct 11, 2023
1 parent fb5ec45 commit d94b6e4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@

- [ ] hera.intel
- [ ] orion.intel
- [ ] hercules.intel
- [ ] cheyenne.intel
- [ ] cheyenne.gnu
- [ ] derecho.intel
- [ ] gaea.intel
- [ ] gaeac5.intel
- [ ] jet.intel
- [ ] wcoss2.intel
- [ ] NOAA Cloud (indicate which platform)
Expand Down
5 changes: 2 additions & 3 deletions ush/get_crontab_contents.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,10 @@ def get_crontab_contents(called_from_cron, machine, debug):
# themselves being called as cron jobs. In that case, we must instead
# call the system version of crontab at /usr/bin/crontab.
#
if machine == "CHEYENNE" or machine == "DERECHO":
crontab_cmd = "crontab"
if machine.upper() == "CHEYENNE" or machine.upper() == "DERECHO":
if called_from_cron:
crontab_cmd = "/usr/bin/crontab"
else:
crontab_cmd = "crontab"

print_info_msg(
f"""
Expand Down

0 comments on commit d94b6e4

Please sign in to comment.