From 824cb13533c90f6a395dc76a0c2b82a5543eee8f Mon Sep 17 00:00:00 2001 From: mauzey1 Date: Thu, 23 Feb 2023 12:49:51 -0800 Subject: [PATCH 1/2] Merge CMIP6 CV tests into Makefile test section --- Makefile.in | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 583dca64..892a786b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -124,7 +124,7 @@ backup: clean @tar cfz $$TGZNAME Cmor; \ @touch $(TIMESTAMPDIR)/cmor_`$(TIMESTAMP)`_full.time; \ @echo "Full backup tar file created : $$TGZNAME") -test: cmor test_C @TEST_FORTRAN@ test_python +test: cmor test_C @TEST_FORTRAN@ test_python test_cmip6_cv @echo "All C, Fortran, and Python tests passed successfully" test_C: cmor mkdir -p test_bin @@ -224,7 +224,45 @@ test_python: python env TEST_NAME=Test/test_cmor_python_not_enough_data.py make test_a_python env TEST_NAME=Test/test_cmor_python_not_enough_times_written.py make test_a_python env TEST_NAME=Test/test_python_forecast_coordinates.py make test_a_python -test_python_2gb: +test_cmip6_cv: python + env TEST_NAME=Test/test_python_CMIP6_CV_sub_experimentnotset.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_sub_experimentbad.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_furtherinfourl.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_fxtable.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_unicode.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_forcemultipleparent.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badsource.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_parentvariantlabel.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_nomipera.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badgridgr.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badinstitution.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badsourcetype.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badsourceid.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badgridresolution.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_terminate_signal.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_trackingprefix.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_parentmipera.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_bad_data_specs.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_longrealizationindex.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_sub_experimentIDbad.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badsourcetypeCHEMAER.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_parentsourceid.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_hierarchicalattr.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badsourcetypeRequired.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_forcenoparent.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_load_tables.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_sub_experiment_id.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badvariant.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_baddirectory.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_trackingNoprefix.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_HISTORY.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_parenttimeunits.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_invalidsourceid.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_forceparent.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_externalvariables.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badinstitutionID.py make test_a_python + env TEST_NAME=Test/test_python_CMIP6_CV_badgridlabel.py make test_a_python +test_python_2gb: python env TEST_NAME=Test/test_python_2Gb_file.py make test_a_python env TEST_NAME=Test/test_python_2Gb_slice.py make test_a_python From fb738aeb904a02c48e202d28de80ce7c3cefabad Mon Sep 17 00:00:00 2001 From: mauzey1 Date: Thu, 23 Feb 2023 13:09:31 -0800 Subject: [PATCH 2/2] Remove run_prepare_tests section from CI config --- .circleci/config.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1ac346b9..a73ffd49 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -72,19 +72,6 @@ aliases: ./configure --prefix=$CONDA_PREFIX --with-python --with-uuid=$CONDA_PREFIX --with-json-c=$CONDA_PREFIX --with-udunits2=$CONDA_PREFIX --with-netcdf=$CONDA_PREFIX --enable-verbose-test make test -o cmor -o python - - &run_prepare_tests - name: run_prepare_tests - command: | - source $BASH_ENV - source $WORKDIR/miniconda/etc/profile.d/conda.sh - conda activate base - export UVCDAT_ANONYMOUS_LOG=False - set +e - conda activate test_py$PYTHON_VERSION - set -e - export PYTHONPATH=Test/:$PYTHONPATH - for file in `ls -1 Test/test_python_CMIP6_CV*.py`; do echo $file; python $file; mystatus=$?; if [[ "$mystatus" != "0" ]]; then return ${mystatus}; fi; done - - &conda_upload name: conda_upload command: | @@ -136,7 +123,6 @@ jobs: - run: *conda_build - run: *pull_submodules - run: *run_cmor_tests - - run: *run_prepare_tests - persist_to_workspace: root: . paths: