From c993dac85ec2f7bcb3242a9d2cc66f29137cb2d5 Mon Sep 17 00:00:00 2001 From: tmcguinness Date: Thu, 25 Apr 2024 16:01:44 +0000 Subject: [PATCH 1/2] added a no operations text for a branch to differ from develop for a ci selftest --- ci/scripts/driver.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/scripts/driver.sh b/ci/scripts/driver.sh index 1ed3a0aac16..c3f92f99e89 100755 --- a/ci/scripts/driver.sh +++ b/ci/scripts/driver.sh @@ -12,6 +12,7 @@ set -eux # development branch for the global-workflow repo. It then stages tests directories per # PR number and calls clone-build_ci.sh to perform a clone and full build from the PR. # It then is ready to run a suite of regression tests with various configurations +# no op selftest ####################################################################################### export REPO_URL=${REPO_URL:-"git@github.com:NOAA-EMC/global-workflow.git"} From f96e851b49d93a9676f0396031e8bcf67eccc837 Mon Sep 17 00:00:00 2001 From: tmcguinness Date: Thu, 25 Apr 2024 23:28:35 +0000 Subject: [PATCH 2/2] removed j from gh clone and extra print line in rocotostat that was stoping the check script --- ci/scripts/clone-build_ci.sh | 2 +- ci/scripts/driver.sh | 1 - ci/scripts/utils/rocotostat.py | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/scripts/clone-build_ci.sh b/ci/scripts/clone-build_ci.sh index 029c616dfbe..2b0ca5f072d 100755 --- a/ci/scripts/clone-build_ci.sh +++ b/ci/scripts/clone-build_ci.sh @@ -48,7 +48,7 @@ git clone "${REPO_URL}" cd global-workflow || exit 1 # checkout pull request -"${GH}" pr checkout "${PR}" --repo "${REPO_URL}" --recurse-submodules -j 4 +"${GH}" pr checkout "${PR}" --repo "${REPO_URL}" --recurse-submodules HOMEgfs="${PWD}" source "${HOMEgfs}/ush/detect_machine.sh" diff --git a/ci/scripts/driver.sh b/ci/scripts/driver.sh index c3f92f99e89..1ed3a0aac16 100755 --- a/ci/scripts/driver.sh +++ b/ci/scripts/driver.sh @@ -12,7 +12,6 @@ set -eux # development branch for the global-workflow repo. It then stages tests directories per # PR number and calls clone-build_ci.sh to perform a clone and full build from the PR. # It then is ready to run a suite of regression tests with various configurations -# no op selftest ####################################################################################### export REPO_URL=${REPO_URL:-"git@github.com:NOAA-EMC/global-workflow.git"} diff --git a/ci/scripts/utils/rocotostat.py b/ci/scripts/utils/rocotostat.py index 0cb0c6c09f1..884ff82e3df 100755 --- a/ci/scripts/utils/rocotostat.py +++ b/ci/scripts/utils/rocotostat.py @@ -85,8 +85,6 @@ def rocoto_statcount(): rocoto_status = rocoto_statcount() if rocoto_status['CYCLES_TOTAL'] == rocoto_status['CYCLES_DONE']: - if not args.export: - print(f"All {rocoto_status['CYCLES_TOTAL']} Cycles are Done") rocoto_state = 'DONE' elif rocoto_status['DEAD'] > 0: error_return = rocoto_status['FAIL'] + rocoto_status['DEAD']