Unverified Commit dfef4425 authored by AgoinsUSGS's avatar AgoinsUSGS Committed by GitHub
Browse files

Merge pull request #389 from chrisryancombs/cmake 

Improved testing pass/fail rate
parents 84b89f7d 9bc93d9a

Jenkinsfile

+9 −6
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ pipeline { 
            label 'cmake'

            image 'chrisryancombs/docker_isis'

            args  '''\

                    -v /usgs/pkgs/local/v007:/usgs/pkgs/local/v007 \

                    -v /usgs/cpkgs/isis3/data:/usgs/cpkgs/isis3/data \

                    -v /usgs/cpkgs/isis3/testData:/usgs/cpkgs/isis3/testData\

                  '''
@@ -19,14 +18,17 @@ pipeline { 
        stage('Config') { 

            steps { 

                sh """

                    conda env create -n isis3 -f environment.yml

                    source activate isis3

                    mkdir -p ./install ./build && cd build

                    cmake -GNinja -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis \

                    cmake -GNinja -DJP2KFLAG=ON -DCMAKE_INSTALL_PREFIX=../install -Disis3Data=/usgs/cpkgs/isis3/data -Disis3TestData=/usgs/cpkgs/isis3/testData ../isis \

                   """

            }

        }

        stage('Build') { 

            steps {

                sh """

                    export PATH="${PATH}:/opt/conda/envs/isis3/bin"

                    set +e

                    cd build

                    ninja -j8 && ninja install
@@ -36,12 +38,13 @@ pipeline { 
        stage('Test'){

            steps {

                sh """

                    export PATH="${PATH}:${ISISROOT}/bin"

                    export PATH="${PATH}:/opt/conda/envs/isis3/bin/:${workspace}/install/bin"

                    export ISISROOT="${workspace}/install"

                    set +e

                    cd build

                    ctest -j8 -R _unit_ 

                    ctest -j8 -R _app_ 

                    ctest -j8 -R _module_ 

                    ctest -j8 -R _unit_ --timeout 500

                    ctest -j8 -R _app_ --timeout 500

                    ctest -j8 -R _module_ --timeout 500 

                   """

            }

        }

environment.yml

+3 −0
Original line number Diff line number Diff line
@@ -66,4 +66,7 @@ dependencies: 
  - qwt

  - tnt==126=0

  - xalan-c==1.11

  - x264==20131218

  - make

  - kakadu==1

prefix: /scratch/anaconda3/envs/isis

isis/cmake/FindKakadu.cmake

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ 
if(JP2KFLAG)

  find_path(KAKADU_INCLUDE_DIR

    NAME kdu_kernels.h

    PATH_SUFFIXES

    kakadu/v7_9_1-01762L/

    PATHS /usgs/apps/kakadu/v7_9_1-01762L/managed/all_includes/

  )



  find_library(KAKADU_A_LIBRARY

isis/src/base/objs/ProcessExportPds4/ProcessExportPds4.truth

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Testing default object 
<?xml-model href="http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1800.sch" schemetypens="http://purl.oclc.org/dsdl/schematron"?>

<Product_Observational/>



Testing defaulte CaSSIS export

Testing default CaSSIS export

<?xml version="1.0" encoding="utf-8"?>

<?xml-model href="http://pds.nasa.gov/pds4/disp/v1/PDS4_DISP_1700.sch" schemetypens="http://purl.oclc.org/dsdl/schematron"?>

<?xml-model href="http://pds.nasa.gov/pds4/pds/v1/PDS4_PDS_1800.sch" schemetypens="http://purl.oclc.org/dsdl/schematron"?>

linux-spec.txt

deleted100644 → 0
+0 −123
Original line number Diff line number Diff line 
# This file may be used to create an environment using:

# $ conda create --name <env> --file <this file>

# platform: linux-64

@EXPLICIT

https://conda.anaconda.org/krodriguez/linux-64/bullet-2.86.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/bzip2-1.0.6-1.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/ca-certificates-2017.08.26-h1d4fec5_0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/ds9-7.5-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/eigen-3.3.3-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/embree-2.14.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/expat-2.2.5-0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/flann-1.8.4-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/freeglut-3.0.0-4.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/geos-3.5.1-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/gettext-0.19.8.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/giflib-5.1.4-0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/gmm-5.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/gmp-6.1.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/icu-58.2-0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/jama-125-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/jbig-2.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/jpeg-9b-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/krb5-1.14.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libffi-3.2.1-3.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libgcc-4.8.5-1.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libgcc-ng-7.2.0-hdf63c60_3.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libgfortran-3.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libiconv-1.15-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libstdcxx-ng-7.2.0-hdf63c60_3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libuv-1.11.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/noarch/llvm-meta-5.0.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/m4-1.4.17-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/metis-5.1.0-3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/mysql-connector-c-6.1.6-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/nanoflann-1.2.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/ncurses-5.9-10.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/ninja-1.7.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/nn-1.86.0-2.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/patchelf-0.9-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/pcre-8.39-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/pixman-0.34.0-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/proj4-4.9.3-5.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/pthread-stubs-0.3-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/rhash-1.3.4-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/sqlite-3.13.0-1.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/system-5.8-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/tbb-4.4_20160526-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/tk-8.5.19-2.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/tnt-126-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/x264-20131217-3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-kbproto-1.0.7-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-libxau-1.0.8-3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-libxdmcp-1.1.2-3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-renderproto-0.11.1-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-xproto-7.0.31-6.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xz-5.2.3-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/yaml-0.1.7-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/zlib-1.2.11-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/boost-cpp-1.65.1-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/cspice-66-0.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/dbus-1.10.20-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/doxygen-1.8.14-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/ffmpeg-3.2.4-3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/glib-2.51.4-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/hdf5-1.8.18-2.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/isl-0.12.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/jasper-1.900.1-1.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/jsoncpp-1.8.3-h3a67955_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/lapack-3.6.1-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libedit-3.1.20170329-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libpng-1.6.28-2.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/libprotobuf-3.2.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libtiff-4.0.9-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libxcb-1.12-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libxml2-2.9.7-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/llvmdev-5.0.0-default_1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/mpfr-3.1.5-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/openblas-0.2.19-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/openssl-1.0.2n-0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/qhull-7.2.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/readline-6.2-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/blas-1.1-openblas.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/cloog-0.18.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/freetype-2.7-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/geotiff-1.4.2-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/gstreamer-1.8.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libssh2-1.8.0-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/libwebp-0.5.2-7.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/mesalib-17.2.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/mpc-1.0.3-4.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/mysql-5.7.20-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/python-3.6.0-2.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-libx11-1.6.4-6.tar.bz2

https://conda.anaconda.org/anaconda/linux-64/bz2file-0.98-py36_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/certifi-2018.1.18-py36_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/curl-7.55.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/fontconfig-2.12.1-4.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/future-0.16.0-py36_0.tar.bz2

https://repo.continuum.io/pkgs/free/linux-64/gcc-4.8.5-7.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/gsl-2.2.1-blas_openblas_3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/gst-plugins-base-1.8.0-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/numpy-1.13.3-py36_blas_openblas_200.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/sip-4.18-py36_1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/six-1.11.0-py36_1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/suitesparse-4.5.4-blas_openblas_200.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/superlu-5.2.1-blas_openblas_201.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/xorg-libxrender-0.9.10-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/boost-1.65.1-py36_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/cairo-1.14.6-4.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/cmake-3.9.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/qt-5.6.2-6.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/setuptools-38.5.1-py36_0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/vtk-8.1.0-py36_mesalib_0.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/xerces-c-3.1.4-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/harfbuzz-1.3.4-2.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/pcl-1.8.1-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/protobuf-3.5.1-py36_3.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/pyqt-5.6.0-py36_4.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/qwt-6.1.3-1.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/wheel-0.30.0-py36_2.tar.bz2

https://conda.anaconda.org/usgs-astrogeology/linux-64/xalan-c-1.11-0.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/opencv-3.2.0-np113py36_blas_openblas_203.tar.bz2

https://conda.anaconda.org/conda-forge/linux-64/pip-9.0.1-py36_1.tar.bz2