Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/run_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ module use $GDAS_MODULE_USE
module load GDAS/$TARGET
echo "---------------------------------------------------" >> $outfile
rm -rf log.ctest
ctest -R gdasapp --output-on-failure &>> log.ctest
ctest -E "manual" -R gdasapp --output-on-failure &>> log.ctest
ctest_status=$?
npassed=$(cat log.ctest | grep "tests passed")
if [ $ctest_status -eq 0 ]; then
Expand Down
16 changes: 4 additions & 12 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -134,19 +134,11 @@ if (WORKFLOW_TESTS)
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/testrun)
endif()

# fv3jedi tests
if (${BUILD_GDASBUNDLE})
add_subdirectory(fv3jedi)
endif()

# soca tests
if (${BUILD_GDASBUNDLE})
add_subdirectory(soca)
endif()

# snow da tests
if (${BUILD_GDASBUNDLE})
add_subdirectory(snow)
add_subdirectory(fv3jedi) # fv3jedi tests
add_subdirectory(soca) # soca tests
add_subdirectory(snow) # snow da tests
add_subdirectory(gw-ci) # replicate the creation of some of the gw-ci tests
endif()

# gdas atm tests
Expand Down
15 changes: 15 additions & 0 deletions test/gw-ci/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Setup the environement
set(HOMEgfs ${CMAKE_SOURCE_DIR}/../../..)
set(RUNTESTS ${CMAKE_CURRENT_BINARY_DIR}/../../test/gw-ci)

# List of g-w ci test to create
set(cycling_tests "C48mx500_3DVarAOWCDA" "C96_atmaerosnowDA" "C96C48_ufs_hybatmDA")

# Prepare the cycling ctests
foreach(pslot ${cycling_tests})
set(YAML ${HOMEgfs}/ci/cases/pr/${pslot}.yaml)
add_test(NAME ${pslot}
COMMAND /bin/bash -c "${PROJECT_SOURCE_DIR}/test/gw-ci/create_exp.sh ${YAML} ${pslot} ${HOMEgfs} ${RUNTESTS}"
WORKING_DIRECTORY ${RUNTESTS})
set_tests_properties(${pslot} PROPERTIES LABELS "manual")
endforeach()
16 changes: 16 additions & 0 deletions test/gw-ci/create_exp.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
expyaml="$1"
export pslot="$2"
HOMEgfs="$3"
export RUNTESTS="$4"/${pslot}
export SLURM_ACCOUNT="da-cpu"
Comment thread
CoryMartin-NOAA marked this conversation as resolved.

# Get ICSDIR_ROOT
source "${HOMEgfs}/ush/detect_machine.sh"
source "${HOMEgfs}/ci/platforms/config.${MACHINE_ID}"

# Source the gw environement
source ${HOMEgfs}/workflow/gw_setup.sh

# Create the experiment
${HOMEgfs}/workflow/create_experiment.py --yaml ${expyaml} --overwrite
4 changes: 3 additions & 1 deletion test/soca/gw/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ set(jjob_list "JGLOBAL_PREP_OCEAN_OBS"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN"
# "JGDAS_GLOBAL_OCEAN_ANALYSIS_LETKF"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_CHKPT"
"JGDAS_GLOBAL_OCEAN_ANALYSIS_POST")
# TODO(WaterPeople) Add back when g-w PR2584 is merged
# "JGDAS_GLOBAL_OCEAN_ANALYSIS_POST")
# TODO(WaterPeople) Add back to the list of tested jobs once fixed
# "JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY")
)

set(setup "")
foreach(jjob ${jjob_list})
Expand Down