From 0661d4cdb9c2baa7e48d88b170241e04aa0a0fd3 Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Wed, 26 Jun 2024 17:02:31 -0400 Subject: [PATCH 1/6] 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 0f53ebff6f..a0cdf8ed64 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 8090469abcb224469c80a70d33da6b23886317a8 Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Thu, 27 Jun 2024 19:51:15 -0400 Subject: [PATCH 2/6] special test case for saving off stmp in global with KEEPDATA=YES for save off size test --- ci/platforms/config.hera | 2 ++ workflow/hosts/hera.yaml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ci/platforms/config.hera b/ci/platforms/config.hera index 6d3e43c820..9f14382eee 100644 --- a/ci/platforms/config.hera +++ b/ci/platforms/config.hera @@ -6,5 +6,7 @@ export HPC_ACCOUNT=nems export max_concurrent_cases=5 export max_concurrent_pr=4 +export KEEPDATA=YES + export JENKINS_AGENT_LANUCH_DIR=/scratch1/NCEPDEV/global/Terry.McGuinness/Jenkins export JENKINS_WORK_DIR=/scratch1/NCEPDEV/global/Terry.McGuinness diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml index 8cf7363605..792985f220 100644 --- a/workflow/hosts/hera.yaml +++ b/workflow/hosts/hera.yaml @@ -4,8 +4,8 @@ BASE_CPLIC: '/scratch1/NCEPDEV/global/glopara/data/ICSDIR/prototype_ICs' PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara' COMINsyn: '/scratch1/NCEPDEV/global/glopara/com/gfs/prod/syndat' HOMEDIR: '/scratch1/NCEPDEV/global/${USER}' -STMP: '/scratch1/NCEPDEV/stmp2/${USER}' -PTMP: '/scratch1/NCEPDEV/stmp4/${USER}' +STMP: '/scratch1/NCEPDEV/global/CI/STMP' +PTMP: '/scratch1/NCEPDEV/global/CI/PTMP' NOSCRUB: $HOMEDIR ACCOUNT: fv3-cpu ACCOUNT_SERVICE: fv3-cpu From 7e868a5446e8b9e0f01ce2c02731ead30ded18f5 Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Thu, 27 Jun 2024 19:55:57 -0400 Subject: [PATCH 3/6] took out no-op line in driver script --- ci/scripts/driver.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/scripts/driver.sh b/ci/scripts/driver.sh index a0cdf8ed64..0f53ebff6f 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"} From 2279c951ea7273f545be599355cb2072328ca28a Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Mon, 8 Jul 2024 13:29:33 -0400 Subject: [PATCH 4/6] moving to availe scatch2 on hera --- workflow/hosts/hera.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml index ae065f4d77..80376275cc 100644 --- a/workflow/hosts/hera.yaml +++ b/workflow/hosts/hera.yaml @@ -4,8 +4,8 @@ BASE_CPLIC: '/scratch1/NCEPDEV/global/glopara/data/ICSDIR/prototype_ICs' PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara' COMINsyn: '/scratch1/NCEPDEV/global/glopara/com/gfs/prod/syndat' HOMEDIR: '/scratch1/NCEPDEV/global/${USER}' -STMP: '/scratch1/NCEPDEV/global/CI/STMP' -PTMP: '/scratch1/NCEPDEV/global/CI/PTMP' +STMP: '/scratch2/NCEPDEV/global/CI/STMP' +PTMP: '/scratch2/NCEPDEV/global/CI/PTMP' NOSCRUB: $HOMEDIR ACCOUNT: fv3-cpu ACCOUNT_SERVICE: fv3-cpu From 692341ed3cd02636d62e7a43cbfb0230508d8a51 Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Mon, 8 Jul 2024 13:42:23 -0400 Subject: [PATCH 5/6] moved KEEPDATA=YES as one-off hard codes into config.base --- ci/platforms/config.hera | 2 -- parm/config/gefs/config.base | 2 +- parm/config/gfs/config.base | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/platforms/config.hera b/ci/platforms/config.hera index 9f14382eee..6d3e43c820 100644 --- a/ci/platforms/config.hera +++ b/ci/platforms/config.hera @@ -6,7 +6,5 @@ export HPC_ACCOUNT=nems export max_concurrent_cases=5 export max_concurrent_pr=4 -export KEEPDATA=YES - export JENKINS_AGENT_LANUCH_DIR=/scratch1/NCEPDEV/global/Terry.McGuinness/Jenkins export JENKINS_WORK_DIR=/scratch1/NCEPDEV/global/Terry.McGuinness diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base index 9808b96579..cec9748d89 100644 --- a/parm/config/gefs/config.base +++ b/parm/config/gefs/config.base @@ -78,7 +78,7 @@ export NCP="/bin/cp -p" export NMV="/bin/mv" export NLN="/bin/ln -sf" export VERBOSE="YES" -export KEEPDATA="@KEEPDATA@" +export KEEPDATA="YES" export DEBUG_POSTSCRIPT="NO" # PBS only; sets debug=true export CHGRP_RSTPROD="@CHGRP_RSTPROD@" export CHGRP_CMD="@CHGRP_CMD@" diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base index 9fd66bf0c7..926efefe13 100644 --- a/parm/config/gfs/config.base +++ b/parm/config/gfs/config.base @@ -104,7 +104,7 @@ export NCP="/bin/cp -p" export NMV="/bin/mv" export NLN="/bin/ln -sf" export VERBOSE="YES" -export KEEPDATA="NO" +export KEEPDATA="YES" export DEBUG_POSTSCRIPT="NO" # PBS only; sets debug=true export CHGRP_RSTPROD="@CHGRP_RSTPROD@" export CHGRP_CMD="@CHGRP_CMD@" From 0a498766ca248f319643f7dfb168b008cc56ad0c Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Mon, 8 Jul 2024 16:42:42 -0400 Subject: [PATCH 6/6] updated correct path fomr STMP on Hera under /scratch2/NCEPDEV --- workflow/hosts/hera.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml index 80376275cc..2705120544 100644 --- a/workflow/hosts/hera.yaml +++ b/workflow/hosts/hera.yaml @@ -4,8 +4,8 @@ BASE_CPLIC: '/scratch1/NCEPDEV/global/glopara/data/ICSDIR/prototype_ICs' PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara' COMINsyn: '/scratch1/NCEPDEV/global/glopara/com/gfs/prod/syndat' HOMEDIR: '/scratch1/NCEPDEV/global/${USER}' -STMP: '/scratch2/NCEPDEV/global/CI/STMP' -PTMP: '/scratch2/NCEPDEV/global/CI/PTMP' +STMP: '/scratch2/NCEPDEV/stmp/${USER}/global/CI/STMP' +PTMP: '/scratch2/NCEPDEV/stmp/${USER}/global/CI/PTMP' NOSCRUB: $HOMEDIR ACCOUNT: fv3-cpu ACCOUNT_SERVICE: fv3-cpu