From 972655d60d4ad868dd913267466c872c5bb6fddd Mon Sep 17 00:00:00 2001 From: Michael Kavulich Date: Tue, 10 Oct 2023 12:41:13 -0600 Subject: [PATCH] [develop] Fix crontab bug for Cheyenne and Derecho, update PR template for new platforms (#934) 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) --- .github/PULL_REQUEST_TEMPLATE | 3 +++ ush/get_crontab_contents.py | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index 7b1cdbf109..1c363c651f 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -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) diff --git a/ush/get_crontab_contents.py b/ush/get_crontab_contents.py index 5e9ccd6fa8..ff743eaf18 100644 --- a/ush/get_crontab_contents.py +++ b/ush/get_crontab_contents.py @@ -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. # + crontab_cmd = "crontab" if machine == "CHEYENNE" or machine == "DERECHO": if called_from_cron: crontab_cmd = "/usr/bin/crontab" - else: - crontab_cmd = "crontab" print_info_msg( f"""