diff --git a/tests/rt.sh b/tests/rt.sh index a8a0415fd6..c57033a9e2 100755 --- a/tests/rt.sh +++ b/tests/rt.sh @@ -301,8 +301,8 @@ elif [[ $MACHINE_ID = jet.* ]]; then export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages - ECFLOW_START=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin/ecflow_start.sh - ECF_PORT=$(( $(id -u) + 1500 )) + module load ecflow + ECFLOW_START=/apps/ecflow/5.5.3/bin/ecflow_start.sh QUEUE=batch COMPILE_QUEUE=batch @@ -815,6 +815,12 @@ EOF export skip_check_results=${skip_check_results} export delete_rundir=${delete_rundir} EOF + if [[ $MACHINE_ID = jet.* ]]; then + cat << EOF >> ${RUNDIR_ROOT}/run_test_${TEST_NR}.env + export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH + export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages +EOF + fi if [[ $ROCOTO == true ]]; then rocoto_create_run_task diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh index fd31f7eb62..8daf399a39 100755 --- a/tests/rt_utils.sh +++ b/tests/rt_utils.sh @@ -286,7 +286,7 @@ check_results() { if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ wcoss_dell_p3 || ${MACHINE_ID} =~ wcoss_cray || ${MACHINE_ID} =~ cheyenne || ${MACHINE_ID} =~ gaea || ${MACHINE_ID} =~ jet || ${MACHINE_ID} =~ s4 ]] ; then printf ".......ALT CHECK.." >> ${REGRESSIONTEST_LOG} printf ".......ALT CHECK.." - ${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}/$i ${RUNDIR}/$i >/dev/null 2>&1 && d=$? || d=$? + ${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}/$i ${RUNDIR}/$i > compare_ncfile.log 2>&1 && d=$? || d=$? if [[ $d -eq 1 ]]; then echo "....ERROR" >> ${REGRESSIONTEST_LOG} echo "....ERROR" @@ -534,7 +534,7 @@ ecflow_run() { # in rare instances when UID is greater then 58500 (like Ratko's UID on theia) [[ $ECF_PORT -gt 49151 ]] && ECF_PORT=12179 - ECF_HOST=$( hostname ) + ECF_HOST="${ECF_HOST:-$HOSTNAME}" set +e ecflow_client --ping --host=${ECF_HOST} --port=${ECF_PORT} @@ -544,6 +544,11 @@ ecflow_run() { if [[ ${MACHINE_ID} == wcoss2 ]]; then # Annoying "Has NCO assigned port $ECF_PORT for use by this account? (yes/no) ". echo yes | ${ECFLOW_START} -p ${ECF_PORT} -d ${RUNDIR_ROOT}/ecflow_server + elif [[ ${MACHINE_ID} == jet.* ]]; then + module load ecflow + echo "Using special Jet ECFLOW start procedure" + MYCOMM="bash -l -c \"module load ecflow && ${ECFLOW_START} -d ${RUNDIR_ROOT}/ecflow_server\"" + ssh $ECF_HOST "${MYCOMM}" else ${ECFLOW_START} -p ${ECF_PORT} -d ${RUNDIR_ROOT}/ecflow_server fi