From 7b552023f6c316b7682239552b06dc691fe94505 Mon Sep 17 00:00:00 2001 From: "Terry.McGuinness" Date: Thu, 11 Jul 2024 17:52:19 +0000 Subject: [PATCH 1/3] no op for CI self-test --- ci/scripts/driver.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/scripts/driver.sh b/ci/scripts/driver.sh index acf54381b8..49d63cd390 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 for CI self test ####################################################################################### export REPO_URL=${REPO_URL:-"git@github.com:NOAA-EMC/global-workflow.git"} From e58c194608a9da2ee7d2672e186396dd10c90488 Mon Sep 17 00:00:00 2001 From: "Terry.McGuinness" Date: Fri, 16 Aug 2024 19:59:11 +0000 Subject: [PATCH 2/3] updated the UNKOWN test by count not inclusion --- ci/scripts/utils/rocotostat.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/scripts/utils/rocotostat.py b/ci/scripts/utils/rocotostat.py index 4afea5c8b5..230a1a6025 100755 --- a/ci/scripts/utils/rocotostat.py +++ b/ci/scripts/utils/rocotostat.py @@ -136,7 +136,7 @@ def rocoto_statcount(rocotostat): rocotostat_output = [line.split()[0:4] for line in rocotostat_output] rocotostat_output = [line for line in rocotostat_output if len(line) != 1] - status_cases = ['SUCCEEDED', 'FAIL', 'DEAD', 'RUNNING', 'SUBMITTING', 'QUEUED', 'UNAVAILABLE'] + status_cases = ['SUCCEEDED', 'FAIL', 'DEAD', 'RUNNING', 'SUBMITTING', 'QUEUED', 'UNAVAILABLE', 'UNKNOWN'] rocoto_status = {} status_counts = Counter(case for sublist in rocotostat_output for case in sublist) @@ -214,14 +214,14 @@ def is_stalled(rocoto_status): elif rocoto_status['DEAD'] > 0: error_return = rocoto_status['FAIL'] + rocoto_status['DEAD'] rocoto_state = 'FAIL' - elif 'UNAVAILABLE' in rocoto_status or 'UNKNOWN' in rocoto_status: + elif rocoto_status['UNAVAILABLE'] > 0 or rocoto_status['UNKNOWN'] > 0: rocoto_status = attempt_multiple_times(lambda: rocoto_statcount(rocotostat), 2, 120, ProcessError) error_return = 0 rocoto_state = 'RUNNING' - if 'UNAVAILABLE' in rocoto_status: + if rocoto_status['UNAVAILABLE'] > 0: error_return = rocoto_status['UNAVAILABLE'] rocoto_state = 'UNAVAILABLE' - if 'UNKNOWN' in rocoto_status: + if rocoto_status['UNKNOWN'] > 0: error_return += rocoto_status['UNKNOWN'] rocoto_state = 'UNKNOWN' elif is_stalled(rocoto_status): From e69d72e7e5d5976805d35255b52c5e70b084d63e Mon Sep 17 00:00:00 2001 From: "Terry.McGuinness" Date: Fri, 16 Aug 2024 20:09:45 +0000 Subject: [PATCH 3/3] removed no-op from driver.sh --- ci/scripts/driver.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/scripts/driver.sh b/ci/scripts/driver.sh index 49d63cd390..acf54381b8 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 for CI self test ####################################################################################### export REPO_URL=${REPO_URL:-"git@github.com:NOAA-EMC/global-workflow.git"}