Changeset 18399 for issm/trunk-jpl/jenkins/linux64_murdo

Timestamp:

08/15/14 10:34:05 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying jenkins config

File:

• issm/trunk-jpl/jenkins/linux64_murdo (modified) (4 diffs)

issm/trunk-jpl/jenkins/linux64_murdo

@@ -13 +13 @@
         --with-matlab-dir=$MATLAB_DIR \
         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
-        --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich" \
         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
+        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
+        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-python-dir=$ISSM_DIR/externalpackages/python/install\
         --with-python-numpy-dir=$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy\
-        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
-        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
-        --with-graphics-lib="/usr/lib/x86_64-linux-gnu/libX11.so" \
         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
         --with-boost-dir=$ISSM_DIR/externalpackages/boost/install/ \
+        --with-fortran-lib="-L/usr/lib/gcc/x86_64-linux-gnu/4.6/ -lgfortran" \
         --with-numthreads=18 \
         --enable-development \
@@ -55 +55 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="autotools install.sh                
-                                                matlab    install.sh                
-                                                mpich     install-3.0-linux64.sh    
-                                                cmake     install.sh                
-                                                petsc     install-3.5-linux64.sh    
-                                                triangle  install-linux64.sh        
-                                                boost     install.sh                
-                                                dakota    install-5.3.1-linux64.sh  
-                                                chaco     install.sh 
+EXTERNALPACKAGES="autotools     install.sh                
+                                                matlab        install.sh                
+                                                mpich         install-3.0-linux64.sh    
+                                                cmake         install.sh                
+                                                petsc         install-3.5-linux64.sh    
+                                                triangle      install-linux64.sh        
+                                                boost         install.sh                
+                                                dakota        install-5.3.1-linux64.sh  
+                                                chaco         install.sh 
                                                 python        install-2.7.3-linux64.sh    
                                                 nose          install-linux64-python2.sh  
@@ -74 +74 @@
                                                 netcdf        install.sh                  
                                                 netcdf-python install.sh
-                                                shell2junit install.sh"
+                                                shell2junit   install.sh"
 
 
@@ -86 +86 @@
 ISSM_COMPILATION="yes"
 
-#----------------------#
-# 5: Mail notification #
-#----------------------#
-
-#Mail delivery. If SKIPMAIL="no", the html nightly run report will be
-#sent to the adresses present in $ISSM_DIR/cron/mailinglist.
-SKIPMAIL="no"
-
-#Sender email address
-EMAIL_ADRESS="eric.larour@jpl.nasa.gov"
-
-#Mailing list
-MAILINGLIST="eric.larour@jpl.nasa.gov"
-
 #------------------------#
-# 6: Nightly run options #
+# 5: Nightly run options #
 #------------------------#