From 8e222c1577ab7459a18809cbc34c0ba6a404cd01 Mon Sep 17 00:00:00 2001 From: Terry McGUinness Date: Fri, 21 Feb 2025 14:41:05 -0500 Subject: [PATCH 01/14] moving role of BASH ROOT away from man ROOT dir in platformws --- ci/platforms/config.gaeac5 | 5 +++-- ci/platforms/config.hera | 14 ++++++++++---- ci/platforms/config.hercules | 14 +++++++++++--- ci/platforms/config.orion | 13 ++++++++++--- 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/ci/platforms/config.gaeac5 b/ci/platforms/config.gaeac5 index 675d1b483b6..1223bb1cbb5 100644 --- a/ci/platforms/config.gaeac5 +++ b/ci/platforms/config.gaeac5 @@ -1,6 +1,7 @@ #!/usr/bin/bash -export GFS_CI_ROOT=/gpfs/f5/ufs-ard/world-shared/global/GFS_CI_ROOT -export ICSDIR_ROOT=/gpfs/f5/ufs-ard/world-shared/global/glopara/data/ICSDI + +export GFS_CI_ROOT=/gpfs/f5/epic/proj-shared/global/GFS_CI_ROOT +export ICSDIR_ROOT=/gpfs/f5/epic/proj-shared/global/glopara/data/ICSDIR export HPC_ACCOUNT=ufs-ard export max_concurrent_cases=5 export max_concurrent_pr=4 diff --git a/ci/platforms/config.hera b/ci/platforms/config.hera index 09e2e28ddb3..3cb4e649535 100644 --- a/ci/platforms/config.hera +++ b/ci/platforms/config.hera @@ -1,12 +1,18 @@ #!/usr/bin/bash -export GFS_CI_ROOT=/scratch1/NCEPDEV/global/Terry.McGuinness/GFS_CI_ROOT +export GFS_CI_ROOT=/scratch1/NCEPDEV/global/glopara/GFS_CI_CD export ICSDIR_ROOT=/scratch1/NCEPDEV/global/glopara/data/ICSDIR +# Jenkins directories +export JENKINS_AGENT_LANUCH_DIR=${GFS_CI_ROOT}/Jenkins/agent +export JENKINS_WORK_DIR=${GFS_CI_ROOT}/Jenkins/workspace + +# CTest functional test directories for pre stagged input data export STAGED_TESTS_DIR=${GFS_CI_ROOT}/STAGED_TESTS_DIR + +# CI BASH test directories +export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/Bash + export HPC_ACCOUNT=nems export max_concurrent_cases=5 export max_concurrent_pr=4 - -export JENKINS_AGENT_LANUCH_DIR=/scratch1/NCEPDEV/global/Terry.McGuinness/Jenkins -export JENKINS_WORK_DIR=/scratch1/NCEPDEV/global/Terry.McGuinness diff --git a/ci/platforms/config.hercules b/ci/platforms/config.hercules index 4d5af21c786..4e729d3afba 100644 --- a/ci/platforms/config.hercules +++ b/ci/platforms/config.hercules @@ -2,9 +2,17 @@ export GFS_CI_ROOT=/work2/noaa/stmp/GFS_CI_ROOT/HERCULES export ICSDIR_ROOT=/work/noaa/global/glopara/data/ICSDIR -export HPC_ACCOUNT=fv3-cpu -export max_concurrent_cases=5 -export max_concurrent_pr=4 +# Jenkins directories export JENKINS_AGENT_LANUCH_DIR=/home/role-nems/GFS_CI_ROOT_JENKINS/AGENT_mterry export JENKINS_WORK_DIR=/home/role-nems/GFS_CI_ROOT_JENKINS + +# CTest functional test directories for pre stagged input data +export STAGED_TESTS_DIR=${GFS_CI_ROOT}/STAGED_TESTS_DIR + +# CI BASH test directories +export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/GFS_BASH_CI + +export HPC_ACCOUNT=fv3-cpu +export max_concurrent_cases=5 +export max_concurrent_pr=4 diff --git a/ci/platforms/config.orion b/ci/platforms/config.orion index dbaad7f3d1d..6e2f80b2cc1 100644 --- a/ci/platforms/config.orion +++ b/ci/platforms/config.orion @@ -2,10 +2,17 @@ export GFS_CI_ROOT=/work2/noaa/stmp/GFS_CI_ROOT/ORION export ICSDIR_ROOT=/work/noaa/global/glopara/data/ICSDIR + +# Jenkins directories +export JENKINS_AGENT_LANUCH_DIR=/home/role-nems/GFS_CI_ROOT_JENKINS/AGENT_mterry +export JENKINS_WORK_DIR=/home/role-nems/GFS_CI_ROOT_JENKINS + +# CI BASH test directories +export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/Bash + +# CTest functional test directories for pre stagged input data export STAGED_TESTS_DIR=/work/noaa/stmp/GFS_CI_ROOT/ORION/STAGED_TESTS_DIR + export HPC_ACCOUNT=nems export max_concurrent_cases=5 export max_concurrent_pr=4 - -export JENKINS_AGENT_LANUCH_DIR=/home/role-nems/GFS_CI_ROOT_JENKINS/AGENT_mterry -export JENKINS_WORK_DIR=/home/role-nems/GFS_CI_ROOT_JENKINS From 504f7d53b00e3b29f569f2487c2f3546fe8545f6 Mon Sep 17 00:00:00 2001 From: Terry McGUinness Date: Fri, 21 Feb 2025 14:46:30 -0500 Subject: [PATCH 02/14] Added GFS_BASH_CI_ROOT into bash scripts since GFS_CI_ROOT has a higher role --- ci/scripts/check_ci.sh | 8 ++++---- ci/scripts/driver.sh | 14 ++++++-------- ci/scripts/driver_weekly.sh | 4 ++-- ci/scripts/run_ci.sh | 4 ++-- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/ci/scripts/check_ci.sh b/ci/scripts/check_ci.sh index a89a6610424..be61690588a 100755 --- a/ci/scripts/check_ci.sh +++ b/ci/scripts/check_ci.sh @@ -64,7 +64,7 @@ else echo "rocotocheck being used from ${rocotocheck}" fi -pr_list_dbfile="${GFS_CI_ROOT}/open_pr_list.db" +pr_list_dbfile="${GFS_BASH_CI_ROOT}/open_pr_list.db" pr_list="" if [[ -f "${pr_list_dbfile}" ]]; then @@ -82,10 +82,10 @@ fi for pr in ${pr_list}; do id=$("${GH}" pr view "${pr}" --repo "${REPO_URL}" --json id --jq '.id') - output_ci="${GFS_CI_ROOT}/PR/${pr}/output_runtime_${id}" - output_ci_single="${GFS_CI_ROOT}/PR/${pr}/output_runtime_single.log" + output_ci="${GFS_BASH_CI_ROOT}/PR/${pr}/output_runtime_${id}" + output_ci_single="${GFS_BASH_CI_ROOT}/PR/${pr}/output_runtime_single.log" echo "Processing Pull Request #${pr} and looking for cases" - pr_dir="${GFS_CI_ROOT}/PR/${pr}" + pr_dir="${GFS_BASH_CI_ROOT}/PR/${pr}" # If there is no RUNTESTS dir for this PR then cases have not been made yet if [[ ! -d "${pr_dir}/RUNTESTS" ]]; then diff --git a/ci/scripts/driver.sh b/ci/scripts/driver.sh index 2698fb41abd..f4cb6cf9ad0 100755 --- a/ci/scripts/driver.sh +++ b/ci/scripts/driver.sh @@ -67,7 +67,7 @@ export GH # query repo and get list of open PRs with tags {machine}-CI ############################################################ -pr_list_dbfile="${GFS_CI_ROOT}/open_pr_list.db" +pr_list_dbfile="${GFS_BASH_CI_ROOT}/open_pr_list.db" if [[ ! -f "${pr_list_dbfile}" ]]; then "${ROOT_DIR}/ci/scripts/utils/pr_list_database.py" --create --dbfile "${pr_list_dbfile}" @@ -76,10 +76,8 @@ fi pr_list=$(${GH} pr list --repo "${REPO_URL}" --label "CI-${MACHINE_ID^}-Ready" --state "open" | awk '{print $1}') || true for pr in ${pr_list}; do - pr_dir="${GFS_CI_ROOT}/PR/${pr}" - if [[ ! -d "${pr_dir}" ]]; then - mkdir -p "${pr_dir}" - fi + pr_dir="${GFS_BASH_CI_ROOT}/PR/${pr}" + [[ ! -d ${pr_dir} ]] && mkdir -p "${pr_dir}" db_list=$("${ROOT_DIR}/ci/scripts/utils/pr_list_database.py" --add_pr "${pr}" --dbfile "${pr_list_dbfile}") output_ci_single="${pr_dir}/output_single.log" ############################################################# @@ -164,9 +162,9 @@ for pr in ${pr_list}; do continue fi id=$("${GH}" pr view "${pr}" --repo "${REPO_URL}" --json id --jq '.id') - pr_dir="${GFS_CI_ROOT}/PR/${pr}" + pr_dir="${GFS_BASH_CI_ROOT}/PR/${pr}" output_ci="${pr_dir}/output_ci_${id}" - output_ci_single="${GFS_CI_ROOT}/PR/${pr}/output_single.log" + output_ci_single="${GFS_BASH_CI_ROOT}/PR/${pr}/output_single.log" driver_build_PID=$$ driver_build_HOST=$(hostname -s) "${GH}" pr edit --repo "${REPO_URL}" "${pr}" --remove-label "CI-${MACHINE_ID^}-Ready" --add-label "CI-${MACHINE_ID^}-Building" @@ -284,4 +282,4 @@ done # looping over each open and labeled PR # scrub working directory for older files ########################################## # -#find "${GFS_CI_ROOT}/PR/*" -maxdepth 1 -mtime +3 -exec rm -rf {} \; +#find "${GFS_BASH_CI_ROOT}/PR/*" -maxdepth 1 -mtime +3 -exec rm -rf {} \; diff --git a/ci/scripts/driver_weekly.sh b/ci/scripts/driver_weekly.sh index 3193cc98ed1..6fac3d3e917 100755 --- a/ci/scripts/driver_weekly.sh +++ b/ci/scripts/driver_weekly.sh @@ -61,7 +61,7 @@ set -x # Create a new branch from develop and move yaml files ######################################################### branch="weekly_ci_$(date +%Y%m%d)" -develop_dir="${GFS_CI_ROOT}/develop_weekly" +develop_dir="${GFS_BASH_CI_ROOT}/develop_weekly" echo "Creating new branch ${branch} from develop on ${MACHINE_ID} in ${develop_dir}" rm -Rf "${develop_dir}" mkdir -p "${develop_dir}" @@ -114,5 +114,5 @@ for label in "${PULL_REQUEST_LABELS[@]}" do "${GH}" pr edit --add-label "${label}" done -cd "${GFS_CI_ROOT}" +cd "${GFS_BASH_CI_ROOT}" rm -Rf "${develop_dir}" diff --git a/ci/scripts/run_ci.sh b/ci/scripts/run_ci.sh index 2da5fa2681f..efbd7efcd99 100755 --- a/ci/scripts/run_ci.sh +++ b/ci/scripts/run_ci.sh @@ -44,7 +44,7 @@ else echo "rocotorun being used from ${rocotorun}" fi -pr_list_dbfile="${GFS_CI_ROOT}/open_pr_list.db" +pr_list_dbfile="${GFS_BASH_CI_ROOT}/open_pr_list.db" pr_list="" if [[ -f "${pr_list_dbfile}" ]]; then @@ -64,7 +64,7 @@ fi for pr in ${pr_list}; do echo "Processing Pull Request #${pr} and looking for cases" - pr_dir="${GFS_CI_ROOT}/PR/${pr}" + pr_dir="${GFS_BASH_CI_ROOT}/PR/${pr}" # If the directory RUNTESTS is not present then # setupexpt.py has no been run yet for this PR if [[ ! -d "${pr_dir}/RUNTESTS" ]]; then From a7e040cae990145a0ae76dbf65919cb6e32f1d17 Mon Sep 17 00:00:00 2001 From: Terry McGUinness Date: Fri, 21 Feb 2025 20:53:55 -0500 Subject: [PATCH 03/14] updated path to where CI tests run from Jenkins when using role account on Hera --- ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index e11f253d13d..84660e5e88e 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -6,7 +6,7 @@ def CI_CASES = '' def GH = 'none' // Location of the custom workspaces for each machine in the CI system. They are persistent for each iteration of the PR. def NodeName = [hera: 'Hera-EMC', orion: 'Orion-EMC', hercules: 'Hercules-EMC', gaea: 'Gaea', gaeac6: 'Gaeac6-EMC'] -def custom_workspace = [hera: '/scratch1/NCEPDEV/global/CI', orion: '/work2/noaa/stmp/CI/ORION', hercules: '/work2/noaa/global/CI/HERCULES', gaea: '/gpfs/f5/epic/proj-shared/global/CI', gaeac6: '/gpfs/f6/drsa-precip3/proj-shared/global/CI'] +def custom_workspace = [hera: '/scratch1/NCEPDEV/global/glopara/CI', orion: '/work2/noaa/stmp/CI/ORION', hercules: '/work2/noaa/global/CI/HERCULES', gaea: '/gpfs/f5/epic/proj-shared/global/CI', gaeac6: '/gpfs/f6/drsa-precip3/proj-shared/global/CI'] def repo_url = 'git@github.com:NOAA-EMC/global-workflow.git' def STATUS = 'Passed' From b1cbb5b7745b8f73bb7647730ba3201b43c4173d Mon Sep 17 00:00:00 2001 From: Terry McGUinness Date: Fri, 21 Feb 2025 21:05:54 -0500 Subject: [PATCH 04/14] addeding documentation to custome_workspace in the config file for hera --- ci/platforms/config.hera | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci/platforms/config.hera b/ci/platforms/config.hera index 3cb4e649535..a2d47b1e977 100644 --- a/ci/platforms/config.hera +++ b/ci/platforms/config.hera @@ -6,6 +6,8 @@ export ICSDIR_ROOT=/scratch1/NCEPDEV/global/glopara/data/ICSDIR # Jenkins directories export JENKINS_AGENT_LANUCH_DIR=${GFS_CI_ROOT}/Jenkins/agent export JENKINS_WORK_DIR=${GFS_CI_ROOT}/Jenkins/workspace +# JENKINS cutome_workspace directory where CI jobs are run +# /scratch1/NCEPDEV/global/glopara/CI # CTest functional test directories for pre stagged input data export STAGED_TESTS_DIR=${GFS_CI_ROOT}/STAGED_TESTS_DIR From d6170466b34c0f7dc611708d8773bc72a9957fce Mon Sep 17 00:00:00 2001 From: "emc.glopara" Date: Tue, 4 Mar 2025 21:55:25 +0000 Subject: [PATCH 05/14] updated jenkins launch script to print approprate error message when Jenkins user token has expired --- ci/scripts/utils/launch_java_agent.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ci/scripts/utils/launch_java_agent.sh b/ci/scripts/utils/launch_java_agent.sh index 539ba4ca99d..003695d9d81 100755 --- a/ci/scripts/utils/launch_java_agent.sh +++ b/ci/scripts/utils/launch_java_agent.sh @@ -110,8 +110,8 @@ fi ${GH} --version export GH -check_mark=$("${GH}" auth status -t 2>&1 | grep "Token:" | awk '{print $1}') || true -if [[ "${check_mark}" != "✓" ]]; then +check_token=$("${GH}" auth status 2>&1 | grep "Token:") || true +if [[ "${check_token}" != *"*****"* ]]; then echo "gh not authenticating with emcbot token" exit 1 fi @@ -124,6 +124,7 @@ else exit 1 fi cd "${JENKINS_AGENT_LANUCH_DIR}" +echo "Entered directory ${PWD}" if ! [[ -f agent.jar ]]; then curl -sO "${controller_url}/jnlpJars/agent.jar" @@ -134,6 +135,7 @@ if [[ ! -f "${controller_user_auth_token}" ]]; then echo "User Jenkins authetication TOKEN to the controller for using the Remote API does not exist" exit 1 fi + JENKINS_TOKEN=$(cat "${controller_user_auth_token}") cat << EOF > parse.py @@ -152,8 +154,12 @@ check_node_online() { echo "ERROR: Jenkins controller not reachable. Exiting with error." exit 1 fi + if [[ "${curl_response}" == *"Token expired"* ]]; then + echo "ERROR: Jenkins Token expired" + exit 1 + fi echo -n "${curl_response}" > curl_response - ./parse.py curl_response + ONLINE_STATUS=$(./parse.py curl_response) } lauch_agent () { @@ -170,7 +176,8 @@ if [[ "${force_launch}" == "True" ]]; then exit fi -offline=$(set -e; check_node_online) +check_node_online +offline="${ONLINE_STATUS}" if [[ "${offline}" != "False" ]]; then if [[ "${skip_wait}" != "True" ]]; then From 2e46425bf879573adce3f833410934a61c5d27f1 Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Wed, 5 Mar 2025 10:18:18 -0500 Subject: [PATCH 06/14] Update config.hera to use fv3-cpu instead of nems --- ci/platforms/config.hera | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/platforms/config.hera b/ci/platforms/config.hera index a2d47b1e977..831272a3800 100644 --- a/ci/platforms/config.hera +++ b/ci/platforms/config.hera @@ -15,6 +15,6 @@ export STAGED_TESTS_DIR=${GFS_CI_ROOT}/STAGED_TESTS_DIR # CI BASH test directories export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/Bash -export HPC_ACCOUNT=nems +export HPC_ACCOUNT=fv3-cpu export max_concurrent_cases=5 export max_concurrent_pr=4 From c1f850babd8729340c72391932ded95ca7cc84c8 Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Wed, 5 Mar 2025 10:22:11 -0500 Subject: [PATCH 07/14] Update ci/platforms/config.hera Co-authored-by: Rahul Mahajan --- ci/platforms/config.hera | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/platforms/config.hera b/ci/platforms/config.hera index 831272a3800..d41b1f5a37e 100644 --- a/ci/platforms/config.hera +++ b/ci/platforms/config.hera @@ -13,7 +13,7 @@ export JENKINS_WORK_DIR=${GFS_CI_ROOT}/Jenkins/workspace export STAGED_TESTS_DIR=${GFS_CI_ROOT}/STAGED_TESTS_DIR # CI BASH test directories -export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/Bash +export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/GFS_BASH_CI export HPC_ACCOUNT=fv3-cpu export max_concurrent_cases=5 From c9b559a7ea7213ed1146e27fa748d239b4f0799b Mon Sep 17 00:00:00 2001 From: TerrenceMcGuinness-NOAA Date: Wed, 5 Mar 2025 10:22:30 -0500 Subject: [PATCH 08/14] Update ci/platforms/config.orion Co-authored-by: Rahul Mahajan --- ci/platforms/config.orion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/platforms/config.orion b/ci/platforms/config.orion index 6e2f80b2cc1..04c8d1c08c6 100644 --- a/ci/platforms/config.orion +++ b/ci/platforms/config.orion @@ -8,7 +8,7 @@ export JENKINS_AGENT_LANUCH_DIR=/home/role-nems/GFS_CI_ROOT_JENKINS/AGENT_mterry export JENKINS_WORK_DIR=/home/role-nems/GFS_CI_ROOT_JENKINS # CI BASH test directories -export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/Bash +export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/GFS_BASH_CI # CTest functional test directories for pre stagged input data export STAGED_TESTS_DIR=/work/noaa/stmp/GFS_CI_ROOT/ORION/STAGED_TESTS_DIR From 4219db603d571f235e50f0c41b245ff584462eed Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Wed, 5 Mar 2025 10:17:43 -0600 Subject: [PATCH 09/14] added wrapper on build_compute.sh in Jenkins to pickup HPC_ACCOUNT and use it at the command line --- ci/scripts/utils/ci_utils.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ci/scripts/utils/ci_utils.sh b/ci/scripts/utils/ci_utils.sh index 56b0571adca..bb50524e536 100755 --- a/ci/scripts/utils/ci_utils.sh +++ b/ci/scripts/utils/ci_utils.sh @@ -177,3 +177,10 @@ function cleanup_experiment() { rm -Rf "${EXPDIR}/${pslot:?}" rm -Rf "${STMP}/RUNDIRS/${pslot:?}" } + +function build_compute () { + + source "${HOMEgfs}/ci/platforms/config.${MACHINE_ID}" + ${HOMEgfs}/ci/scripts/utils/build_compute.sh -A "${HPC_ACCOUNT}" -v all + +} From c8ca9a1ac992488a107fd514c2e2ed3a070dac8e Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Wed, 5 Mar 2025 10:21:59 -0600 Subject: [PATCH 10/14] replaced build_compute.sh with wrapper --- ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/Jenkinsfile b/ci/Jenkinsfile index 84660e5e88e..5069bb18be0 100644 --- a/ci/Jenkinsfile +++ b/ci/Jenkinsfile @@ -120,7 +120,7 @@ pipeline { def error_logs_message = "" dir("${HOMEgfs}/sorc") { try { - sh(script: './build_compute.sh all') // build the global-workflow executables + sh(script: "${HOMEgfs}/ci/scripts/utils/ci_utils_wrapper.sh build_compute") // build the global-workflow executables } catch (Exception error_build) { echo "Failed to build global-workflow: ${error_build.getMessage()}" if ( fileExists("logs/error.logs") ) { From 5cbb764eed6b9abeceae936ea5a62be8c3b29247 Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Wed, 5 Mar 2025 10:24:38 -0600 Subject: [PATCH 11/14] updated name of GFS_BASH_CI on Gaea C6 for consistancy --- ci/platforms/config.gaeac6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/platforms/config.gaeac6 b/ci/platforms/config.gaeac6 index 2680a0727ef..bda69c6a98d 100644 --- a/ci/platforms/config.gaeac6 +++ b/ci/platforms/config.gaeac6 @@ -4,7 +4,7 @@ export GFS_CI_ROOT=/ncrc/proj/nggps_emc/${USER}/GFS_CI_CD export ICSDIR_ROOT=/gpfs/f6/bil-fire8/world-shared/global/glopara/data/ICSDIR # CI BASH test directories -export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/Bash +export GFS_BASH_CI_ROOT=${GFS_CI_ROOT}/GFS_BASH_CI # Jenkins directories export JENKINS_AGENT_LANUCH_DIR=${GFS_CI_ROOT}/Jenkins/agent From e91291663ff10aef12ff9fbca4586d21c63273df Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Wed, 5 Mar 2025 10:26:40 -0600 Subject: [PATCH 12/14] shellnorms quoting on build_compute wrapper --- ci/scripts/utils/ci_utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/utils/ci_utils.sh b/ci/scripts/utils/ci_utils.sh index bb50524e536..9e12fe9c07d 100755 --- a/ci/scripts/utils/ci_utils.sh +++ b/ci/scripts/utils/ci_utils.sh @@ -181,6 +181,6 @@ function cleanup_experiment() { function build_compute () { source "${HOMEgfs}/ci/platforms/config.${MACHINE_ID}" - ${HOMEgfs}/ci/scripts/utils/build_compute.sh -A "${HPC_ACCOUNT}" -v all + "${HOMEgfs}/ci/scripts/utils/build_compute.sh" -A "${HPC_ACCOUNT}" -v all } From 88331a78cd2c6e5f990a6eafcf8f3456a092ba89 Mon Sep 17 00:00:00 2001 From: Terry McGuinness Date: Wed, 5 Mar 2025 10:38:34 -0600 Subject: [PATCH 13/14] updated to correct path to the build_compute.sh scripts in the ci utils wrapper --- ci/scripts/utils/ci_utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/utils/ci_utils.sh b/ci/scripts/utils/ci_utils.sh index 9e12fe9c07d..5922243893b 100755 --- a/ci/scripts/utils/ci_utils.sh +++ b/ci/scripts/utils/ci_utils.sh @@ -181,6 +181,6 @@ function cleanup_experiment() { function build_compute () { source "${HOMEgfs}/ci/platforms/config.${MACHINE_ID}" - "${HOMEgfs}/ci/scripts/utils/build_compute.sh" -A "${HPC_ACCOUNT}" -v all + "${HOMEgfs}/sorc/build_compute.sh" -A "${HPC_ACCOUNT}" -v all } From 0a9578dfa88364f0b7cb42092dc1ea26da0d5bcb Mon Sep 17 00:00:00 2001 From: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com> Date: Thu, 6 Mar 2025 13:57:54 +0000 Subject: [PATCH 14/14] Update ci/platforms/config.hera --- ci/platforms/config.hera | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/platforms/config.hera b/ci/platforms/config.hera index d41b1f5a37e..cf0ca640e8a 100644 --- a/ci/platforms/config.hera +++ b/ci/platforms/config.hera @@ -6,7 +6,7 @@ export ICSDIR_ROOT=/scratch1/NCEPDEV/global/glopara/data/ICSDIR # Jenkins directories export JENKINS_AGENT_LANUCH_DIR=${GFS_CI_ROOT}/Jenkins/agent export JENKINS_WORK_DIR=${GFS_CI_ROOT}/Jenkins/workspace -# JENKINS cutome_workspace directory where CI jobs are run +# JENKINS custom_workspace directory where CI jobs are run # /scratch1/NCEPDEV/global/glopara/CI # CTest functional test directories for pre stagged input data