added fix to rocotostat for stalled case and remove dependances to up…

…dates to wxflow
NOAA-EMC · Jun 24, 2024 · fc15469 · fc15469
1 parent 4e882f7
commit fc15469
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/ci-unit_tests.yaml b/.github/workflows/ci-unit_tests.yaml
@@ -24,7 +24,6 @@ jobs:
           sudo apt-get install -y perl libxml-libxml-perl libxml-libxslt-perl libdatetime-perl
           python -m pip install --upgrade pip
           pip install pytest
-          pip install git+https://github.com/TerrenceMcGuinness-NOAA/wxflow.git@config_env_xor
 
       - name: Cache Rocoto Install
         uses: actions/cache@v4
@@ -47,7 +46,6 @@ jobs:
           sudo mkdir -p /work/noaa
           cd $GITHUB_WORKSPACE/sorc/wxflow
           git submodule update --init
-          git checkout config_env_xor
           cd $GITHUB_WORKSPACE/sorc
           ./link_workflow.sh
           cd $GITHUB_WORKSPACE/ci/scripts/tests

diff --git a/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml b/ci/cases/yamls/atmaerosnowDA_defaults_ci.yaml
@@ -2,4 +2,4 @@ defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 base:
   DO_JEDISNOWDA: "YES"
-  ACCOUNT: {{ 'ACCOUNT' | getenv }}
+  ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
diff --git a/ci/cases/yamls/gefs_ci_defaults.yaml b/ci/cases/yamls/gefs_ci_defaults.yaml
@@ -1,4 +1,4 @@
 defaults:
   !INC {{ HOMEgfs }}/parm/config/gefs/yaml/defaults.yaml
 base:
-  ACCOUNT: {{ 'ACCOUNT' | getenv }}
+  HPC_ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
diff --git a/ci/cases/yamls/gfs_defaults_ci.yaml b/ci/cases/yamls/gfs_defaults_ci.yaml
@@ -1,4 +1,4 @@
 defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 base:
-  ACCOUNT: {{ 'ACCOUNT' | getenv }}
+  ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
diff --git a/ci/cases/yamls/gfs_extended_ci.yaml b/ci/cases/yamls/gfs_extended_ci.yaml
@@ -2,7 +2,7 @@ defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 
 base:
-  ACCOUNT: {{ 'ACCOUNT' | getenv }}
+  ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   DO_GOES: "YES"
   DO_BUFRSND: "YES"
   DO_GEMPAK: "YES"

diff --git a/ci/cases/yamls/soca_gfs_defaults_ci.yaml b/ci/cases/yamls/soca_gfs_defaults_ci.yaml
@@ -1,5 +1,5 @@
 defaults:
   !INC {{ HOMEgfs }}/parm/config/gfs/yaml/defaults.yaml
 base:
-  ACCOUNT: {{ 'ACCOUNT' | getenv }}
+  ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
   DO_JEDIOCNVAR: "YES"
diff --git a/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml b/ci/cases/yamls/ufs_hybatmDA_defaults.ci.yaml
@@ -4,7 +4,7 @@ base:
   DOIAU: "NO"
   DO_JEDIATMVAR: "YES"
   DO_JEDIATMENS: "YES"
-  ACCOUNT: {{ 'ACCOUNT' | getenv }}
+  ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
 atmanl:
   LAYOUT_X_ATMANL: 4
   LAYOUT_Y_ATMANL: 4

diff --git a/ci/platforms/config.hera b/ci/platforms/config.hera
@@ -2,7 +2,7 @@
 
 export GFS_CI_ROOT=/scratch1/NCEPDEV/global/Terry.McGuinness/GFS_CI_ROOT
 export ICSDIR_ROOT=/scratch1/NCEPDEV/global/glopara/data/ICSDIR
-export ACCOUNT=nems
+export HPC_ACCOUNT=nems
 export max_concurrent_cases=5
 export max_concurrent_pr=4
 

diff --git a/ci/platforms/config.hercules b/ci/platforms/config.hercules
@@ -2,7 +2,7 @@
 
 export GFS_CI_ROOT=/work2/noaa/stmp/GFS_CI_ROOT/HERCULES
 export ICSDIR_ROOT=/work/noaa/global/glopara/data/ICSDIR
-export ACCOUNT=nems
+export HPC_ACCOUNT=nems
 export max_concurrent_cases=5
 export max_concurrent_pr=4
 

diff --git a/ci/platforms/config.orion b/ci/platforms/config.orion
@@ -2,7 +2,7 @@
 
 export GFS_CI_ROOT=/work2/noaa/stmp/GFS_CI_ROOT/ORION
 export ICSDIR_ROOT=/work/noaa/global/glopara/data/ICSDIR
-export ACCOUNT=nems
+export HPC_ACCOUNT=nems
 export max_concurrent_cases=5
 export max_concurrent_pr=4
 

diff --git a/ci/platforms/config.wcoss2 b/ci/platforms/config.wcoss2
@@ -2,6 +2,6 @@
 
 export GFS_CI_ROOT=/lfs/h2/emc/global/noscrub/globalworkflow.ci/GFS_CI_ROOT
 export ICSDIR_ROOT=/lfs/h2/emc/global/noscrub/emc.global/data/ICSDIR
-export ACCOUNT=GFS-DEV
+export HPC_ACCOUNT=GFS-DEV
 export max_concurrent_cases=5
 export max_concurrent_pr=4
diff --git a/ci/scripts/tests/test_rocotostat.py b/ci/scripts/tests/test_rocotostat.py
@@ -75,7 +75,7 @@ def test_rocoto_stalled():
 
     result = rocoto_statcount(rocotostat)
 
-    assert result['SUCCEEDED'] == 110
+    assert result['SUCCEEDED'] == 10
     assert is_stalled(result)
 
     rmtree(testdata_full_path)
diff --git a/ci/scripts/tests/test_setup.py b/ci/scripts/tests/test_setup.py
@@ -27,8 +27,10 @@ def test_setup_expt():
 def test_setup_xml():
 
     script_content = '''#!/usr/bin/env bash
-export ACCOUNT=fv3-cpu
-export HOMEgfs=foobar
+# TODO - reintroduce this when wxflow update
+# for user space varible clashing is addressed
+#export ACCOUNT=fv3-cpu
+#export HOMEgfs=foobar
 ../../../workflow/setup_xml.py "${1}"
 '''
     with open('run_setup_xml.sh', 'w') as file:

diff --git a/ci/scripts/utils/rocotostat.py b/ci/scripts/utils/rocotostat.py
@@ -218,7 +218,7 @@ def is_stalled(rocoto_status):
         error_return = rocoto_status['UNKNOWN']
         rocoto_state = 'UNKNOWN'
     elif is_stalled(rocoto_status):
-        rocoto_status = attempt_multiple_times(rocoto_statcount(rocotostat), 2, 120, ProcessError)
+        rocoto_status = attempt_multiple_times(lambda:rocoto_statcount(rocotostat), 2, 120, ProcessError)
         if is_stalled(rocoto_status):
             error_return = 3
             rocoto_state = 'STALLED'