Changeset 25670


Ignore:
Timestamp:
10/09/20 11:16:52 (5 years ago)
Author:
jdquinn
Message:

CHG: Reverting changes to test suites + Jenkins projects

Location:
issm/trunk-jpl
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/pine_island-mac

    r25660 r25670  
    1 # NOTE: We do not have a project on Jenkins based on this configuration, but we
    2 #               should maintain it as a way to efficiently test both MATLAB and Python
    3 #               APIs.
    4 #
    5 
    61#--------------------#
    72# ISSM Configuration #
    … …  
    1914        --with-numthreads=4 \
    2015        --with-matlab-dir=${MATLAB_PATH} \
    21         --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
    22         --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
    2316        --with-fortran-lib="-L/usr/local/Cellar/gcc/10.2.0/lib/gcc/10 -lgfortran" \
    2417        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    … …  
    2821        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2922        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
    30         --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
    3123        --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
    32         --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
    33         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
    34         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
    3524        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
    3625        --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
    … …  
    4837        cmake           install.sh
    4938        petsc           install-3.12-mac.sh
    50         gsl                     install.sh
    51         boost           install-1.7-mac.sh
    52         dakota          install-6.2-mac.sh
    53         curl            install-7.67.sh
    54         netcdf          install-4.7-parallel.sh
    55         proj            install-6.2.sh
    56         gdal            install-3-python-netcdf.sh
    57         gshhg           install.sh
    58         gmt                     install-6.0-mac.sh
    59         gmsh            install-4.sh
    6039        triangle        install-mac.sh
    6140        chaco           install.sh
    … …  
    7150# Test suites
    7251MATLAB_TEST=1
    73 PYTHON_TEST=1
     52PYTHON_TEST=0
    7453JAVASCRIPT_TEST=0
    7554EXAMPLES_TEST=0
    … …  
    8766# Nightly run options
    8867#
    89 # See documentation in test/NightlyRun/runme.* for more information.
     68# See documentation in test/NightlyRun/runme.* for more information
    9069#
    9170# NOTE:
    92 # - Errors are large for tests 234, 235, 418, and 420 under MATLAB
    93 # - Tests 444 and 445 fail intermittently under MATLAB with "Index exceeds array bounds."
    94 # - Errors are large for tests 234 418 and 420 under Python
    95 # - See test417.py for why it is excluded
    96 # - Test 444 fails intermittently under Python with "IndexError: list index out of range"
    9771# - test701 is skipped because it uses full Stokes equations
    9872#
    99 MATLAB_NROPTIONS="'exclude',[234 235 418 420 435 444 445 701 702 703]"
    100 PYTHON_NROPTIONS="--exclude 234 417 418 420 435 444 445 701 702 703]"
     73MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),435,701,702,703]"
     74PYTHON_NROPTIONS=""

  • issm/trunk-jpl/jenkins/ross-debian_linux

    r25660 r25670  
    1 # NOTE: We do not have a project on Jenkins based on this configuration, but we
    2 #               should maintain it as a way to efficiently test both MATLAB and Python
    3 #               APIs.
    4 #
    5 
    61#--------------------#
    72# ISSM Configuration #
    … …  
    94
    105MATLAB_PATH="/usr/local/MATLAB/R2019b"
    11 
    126ISSM_CONFIG='\
    137        --prefix=${ISSM_DIR} \
    … …  
    1610        --enable-debugging \
    1711        --with-numthreads=4 \
    18         --with-python-dir=/usr \
    19         --with-python-numpy-dir=/usr/local/lib/python2.7/dist-packages/numpy \
    2012        --with-matlab-dir=${MATLAB_PATH} \
    2113        --with-fortran-lib="-L/usr/lib/x86_64-linux-gnu -lgfortran" \
    … …  
    2618        --with-scalapack-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2719        --with-mumps-dir=${ISSM_DIR}/externalpackages/petsc/install \
    28         --with-hdf5-dir=${ISSM_DIR}/externalpackages/petsc/install \
    2920        --with-petsc-dir=${ISSM_DIR}/externalpackages/petsc/install \
    30         --with-gsl-dir=${ISSM_DIR}/externalpackages/gsl/install \
    31         --with-boost-dir=${ISSM_DIR}/externalpackages/boost/install \
    32         --with-dakota-dir=${ISSM_DIR}/externalpackages/dakota/install \
    3321        --with-triangle-dir=${ISSM_DIR}/externalpackages/triangle/install \
    3422        --with-chaco-dir=${ISSM_DIR}/externalpackages/chaco/install \
    … …  
    4533        cmake           install.sh
    4634        petsc           install-3.12-linux.sh
    47         gsl                     install.sh
    48         boost           install-1.7-linux.sh
    49         dakota          install-6.2-linux.sh
    50         curl            install-7.67.sh
    51         netcdf          install-4.7-parallel.sh
    52         proj            install-6.2.sh
    53         gdal            install-3-python-netcdf.sh
    54         gshhg           install.sh
    55         gmt                     install-6.0-linux.sh
    56         gmsh            install-4.sh
    5735        triangle        install-linux.sh
    5836        chaco           install.sh
    … …  
    6846# Test suites
    6947MATLAB_TEST=1
    70 PYTHON_TEST=1
     48PYTHON_TEST=0
    7149JAVASCRIPT_TEST=0
    7250EXAMPLES_TEST=0
    … …  
    8664# See documentation in test/NightlyRun/runme.* for more information.
    8765#
    88 # - Errors are large for tests 234, 418, and 420 under Python
    89 # - Tests 2002, 2003, 2010, 2101, and 2021 are excluded as Gmsh produces
    90 #       different-sized meshes on macOS and Linux for 3d objects (archives are
    91 #       generated on macOS).
    92 #
    93 MATLAB_NROPTIONS="'exclude',[2002 2003 2010 2021 2101]"
    94 PYTHON_NROPTIONS="--exclude 234 418 420 2002 2003 2010 2021 2101"
     66MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"
     67PYTHON_NROPTIONS=""

  • issm/trunk-jpl/test/NightlyRun/runme.m

    r25656 r25670  
    107107%Process Ids according to benchmarks{{{
    108108if strcmpi(benchmark,'nightly'),
    109         test_ids=intersect(test_ids,union([1:999],[2001:2500]));
     109        test_ids=intersect(test_ids,[1:999]);
    110110elseif strcmpi(benchmark,'validation'),
    111111        test_ids=intersect(test_ids,[1001:1999]);

  • issm/trunk-jpl/test/NightlyRun/runme.py

    r25657 r25670  
    114114    #Process Ids according to benchmarks {{{
    115115    if benchmark == 'nightly':
    116         test_ids = test_ids.intersection(set(range(1, 1000)).union(set(range(2001, 2500))))
     116        test_ids = test_ids.intersection(set(range(1, 1000)))
    117117    elif benchmark == 'validation':
    118118        test_ids = test_ids.intersection(set(range(1001, 2000)))
Note: See TracChangeset for help on using the changeset viewer.