Skip to content

Commit 6b0b180

Browse files
authored
Turn off more large tests (#26)
* Turn off convert state test (#25) * remove test that fails on hera * remove test completely Co-authored-by: daniel.holdaway <daniel.holdaway@noaa.gov> * Turn off more large tests and make them off by default Co-authored-by: daniel.holdaway <daniel.holdaway@noaa.gov> Co-authored-by: danholdaway <danholdaway@users.noreply.github.com>
1 parent bd6b113 commit 6b0b180

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

CI/buildspec_clang.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ phases:
127127
- echo $BUILD_STATUS
128128

129129
- cd /build_container
130-
- ecbuild -DSKIP_LARGE_TESTS=ON -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF /jcsda/fv3-bundle/
130+
- ecbuild -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF /jcsda/fv3-bundle/
131131
- cd fv3-jedi
132132
- make -j8
133133

CI/buildspec_gnu.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ phases:
2020
- echo $CODEBUILD_WEBHOOK_EVENT
2121
- echo $CODEBUILD_WEBHOOK_TRIGGER
2222
- echo $CODEBUILD_WEBHOOK_BASE_REF
23-
23+
2424
# Codebuild only runs on PUSH events if HEAD_REF
2525
# is refs/heads/develop (merge to develop). In this
2626
# case CODEBUILD_GIT_BRANCH="develop"
@@ -135,7 +135,7 @@ phases:
135135

136136
#gsw
137137
- ./clone.sh $GIT_USER $GIT_PASS jcsda-internal/GSW-Fortran $CODEBUILD_GIT_BRANCH gsw /jcsda/fv3-bundle develop
138-
138+
139139
# move CMakeLists.txt
140140
- cp CMakeLists.txt /jcsda/fv3-bundle
141141

@@ -157,7 +157,7 @@ phases:
157157
&& echo $CXX
158158
&& echo $FC
159159
&& CC=mpicc CXX=mpicxx FC=mpifort
160-
&& cmake -DCMAKE_MODULE_PATH=/usr/local/share/ecbuild/cmake/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_GPROF=ON -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF -DTEST_TIME_REF_FV3=CTestCostData.txt.awsgnu.test /jcsda/fv3-bundle
160+
&& cmake -DCMAKE_MODULE_PATH=/usr/local/share/ecbuild/cmake/ -DSKIP_LARGE_TESTS=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_GPROF=ON -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF -DTEST_TIME_REF_FV3=CTestCostData.txt.awsgnu.test /jcsda/fv3-bundle
161161
&& cd fv3-jedi
162162
&& make -j8"
163163

CI/buildspec_intel.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ phases:
8888

8989
# Set crtm branch name
9090
- export CRTM_JEDI_BRANCH="v2.3-jedi"
91-
91+
9292
- if [ "$CODEBUILD_GIT_BRANCH" = "develop" ];
9393
then export CODEBUILD_GIT_BRANCH_FORK="release-stable";
9494
export CODEBUILD_GIT_BRANCH_CRTM=${CRTM_JEDI_BRANCH};
@@ -182,7 +182,7 @@ phases:
182182
&& . /opt/intel/compilers_and_libraries/linux/bin/compilervars.sh
183183
&& cd /build_container
184184
&& ls
185-
&& ecbuild /jcsda/fv3-bundle/ -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF -DTEST_TIME_REF_FV3=CTestCostData.txt.awsintel.test
185+
&& ecbuild /jcsda/fv3-bundle/ -DSKIP_LARGE_TESTS=OFF -DBUNDLE_SKIP_GEOS-AERO=OFF -DBUNDLE_SKIP_ROPP-UFO=OFF -DTEST_TIME_REF_FV3=CTestCostData.txt.awsintel.test
186186
&& cd fv3-jedi
187187
&& make -j8"
188188

test/CMakeLists.txt

+14-10
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# Option not to run with large tests
77
# ----------------------------------
8-
option(SKIP_LARGE_TESTS "Skip tests with more than 6 processors" OFF)
8+
option(SKIP_LARGE_TESTS "Skip tests with more than 6 processors" ON)
99

1010
# Create the Data/ directory
1111
# --------------------------
@@ -1021,10 +1021,12 @@ fv3jedi_add_test( NAME hyb-fgat_gfs_aero
10211021

10221022
# 4DEnVar
10231023
# -------
1024-
fv3jedi_add_test( NAME 4denvar
1025-
EXE fv3jedi_var.x
1026-
MPI 18
1027-
TEST_DEPENDS bumpparameters_nicas_gfs )
1024+
if (NOT SKIP_LARGE_TESTS)
1025+
fv3jedi_add_test( NAME 4denvar
1026+
EXE fv3jedi_var.x
1027+
MPI 18
1028+
TEST_DEPENDS bumpparameters_nicas_gfs )
1029+
endif()
10281030

10291031
# Hybrid 4DVar
10301032
# ------------
@@ -1051,11 +1053,13 @@ fv3jedi_add_test( NAME addincrement_gfs
10511053
TOL 1.0e-3 0
10521054
TEST_DEPENDS diffstates_gfs )
10531055

1054-
fv3jedi_add_test( NAME addincrement_geos
1055-
EXE fv3jedi_addincrement.x
1056-
MPI 12
1057-
TOL 1.0e-4 0
1058-
TEST_DEPENDS diffstates_geos )
1056+
if (NOT SKIP_LARGE_TESTS)
1057+
fv3jedi_add_test( NAME addincrement_geos
1058+
EXE fv3jedi_addincrement.x
1059+
MPI 12
1060+
TOL 1.0e-4 0
1061+
TEST_DEPENDS diffstates_geos )
1062+
endif()
10591063

10601064
# LETKF / LGETKF
10611065
# --------------

0 commit comments

Comments
 (0)