Changeset 24703


Ignore:
Timestamp:
04/08/20 10:36:32 (5 years ago)
Author:
jdquinn
Message:

CHG: No longer relying on ssh-agent to ship binaries; reverting uncommented blocks of packaging scripts

Location:
issm/trunk-jpl
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/boost/install-1.72-mac-static.sh

    r24676 r24703  
    3737./b2 toolset=darwin link=static install
    3838
    39 # Copy binary to install directory
    40 mkdir ${BOOST_ROOT}/install/bin
    41 cp bjam ${BOOST_ROOT}/install/bin
    42 
    4339# Remove any dynamic libraries that may have been compiled
    4440#
    4541# TODO: Reconfigure so that dynamic libraries are not compiled at all
    4642#
    47 rm -f $(ls ${BOOST_ROOT}/install/lib/*.dylib)
     43rm -f $(find ${BOOST_ROOT}/install/lib -name *.dylib)

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-with_dakota.sh

    r24702 r24703  
    4949cp ${LIBGFORTRAN} ${LIBGFORTRAN_DIST} 2> /dev/null
    5050
    51 # # Run tests
    52 # echo "Running tests"
    53 # cd ${ISSM_DIR}/test/NightlyRun
     51# Run tests
     52echo "Running tests"
     53cd ${ISSM_DIR}/test/NightlyRun
    5454
    55 # # Check that MATLAB tests run
    56 # echo "Running MATLAB tests"
     55# Check that MATLAB tests run
     56echo "Running MATLAB tests"
    5757
    58 # rm matlab.log 2> /dev/null
     58rm matlab.log 2> /dev/null
    5959
    60 # # Run MATLAB tests redirecting output to logfile and suppressing output to console
    61 # ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log &> /dev/null
     60# Run MATLAB tests redirecting output to logfile and suppressing output to console
     61${MATLAB_PATH}/bin/matlab -nojvm -nosplash -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log &> /dev/null
    6262
    63 # # Check that MATLAB did not exit in error
    64 # matlabExitCode=`echo $?`
    65 # matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
     63# Check that MATLAB did not exit in error
     64matlabExitCode=`echo $?`
     65matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
    6666
    67 # if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
    68 #       echo "----------MATLAB exited in error!----------"
    69 #       cat matlab.log
    70 #       echo "-----------End of matlab.log-----------"
     67if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
     68        echo "----------MATLAB exited in error!----------"
     69        cat matlab.log
     70        echo "-----------End of matlab.log-----------"
    7171
    72 #       # Clean up execution directory
    73 #       rm -rf ${ISSM_DIR}/execution/*
     72        # Clean up execution directory
     73        rm -rf ${ISSM_DIR}/execution/*
    7474
    75 #       exit 1
    76 # fi
     75        exit 1
     76fi
    7777
    78 # # Check that all MATLAB tests passed
    79 # numMatlabTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
     78# Check that all MATLAB tests passed
     79numMatlabTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
    8080
    81 # if [[ ${numMatlabTestsFailed} -ne 0 ]]; then
    82 #       echo "One or more MATLAB tests FAILED"
    83 #       exit 1;
    84 # else
    85 #       echo "All MATLAB tests PASSED"
    86 # fi
     81if [[ ${numMatlabTestsFailed} -ne 0 ]]; then
     82        echo "One or more MATLAB tests FAILED"
     83        exit 1;
     84else
     85        echo "All MATLAB tests PASSED"
     86fi
    8787
    88 # # Check that Python tests run
    89 # echo "Running Python tests"
     88# Check that Python tests run
     89echo "Running Python tests"
    9090
    91 # export PATH="${PATH}:${ISSM_DIR}/bin"
    92 # export PYTHONPATH="${ISSM_DIR}/src/m/dev"
    93 # export PYTHONSTARTUP="${PYTHONPATH}/devpath.py"
    94 # export PYTHONUNBUFFERED=1 # We don't want Python to buffer output, otherwise issm.exe output is not captured
     91export PATH="${PATH}:${ISSM_DIR}/bin"
     92export PYTHONPATH="${ISSM_DIR}/src/m/dev"
     93export PYTHONSTARTUP="${PYTHONPATH}/devpath.py"
     94export PYTHONUNBUFFERED=1 # We don't want Python to buffer output, otherwise issm.exe output is not captured
    9595
    96 # rm python.log 2> /dev/null
    97 # ./runme.py ${PYTHON_NROPTIONS} &> python.log 2>&1
     96rm python.log 2> /dev/null
     97./runme.py ${PYTHON_NROPTIONS} &> python.log 2>&1
    9898
    99 # # Check that Python did not exit in error
    100 # pythonExitCode=`echo $?`
    101 # pythonExitedInError=`grep -E "Error|Traceback|bad interpreter" python.log | wc -l`
     99# Check that Python did not exit in error
     100pythonExitCode=`echo $?`
     101pythonExitedInError=`grep -E "Error|Traceback|bad interpreter" python.log | wc -l`
    102102
    103 # if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
    104 #       echo "----------Python exited in error!----------"
    105 #       cat python.log
    106 #       echo "-----------End of python.log-----------"
     103if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
     104        echo "----------Python exited in error!----------"
     105        cat python.log
     106        echo "-----------End of python.log-----------"
    107107
    108 #       # Clean up execution directory
    109 #       rm -rf ${ISSM_DIR}/execution/*
     108        # Clean up execution directory
     109        rm -rf ${ISSM_DIR}/execution/*
    110110
    111 #       exit 1
    112 # fi
     111        exit 1
     112fi
    113113
    114 # # Check that all Python tests passed
    115 # numPythonTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
     114# Check that all Python tests passed
     115numPythonTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
    116116
    117 # if [[ ${numPythonTestsFailed} -ne 0 ]]; then
    118 #       echo "One or more Python tests FAILED"
    119 #       exit 1
    120 # else
    121 #       echo "All Python tests PASSED"
    122 # fi
     117if [[ ${numPythonTestsFailed} -ne 0 ]]; then
     118        echo "One or more Python tests FAILED"
     119        exit 1
     120else
     121        echo "All Python tests PASSED"
     122fi
    123123
    124124# Create tarball
    … …  
    144144        echo "FAILED: Manually check connection"
    145145        exit 1
    146 else
    147         echo "SUCCESS"
    148146fi

  • issm/trunk-jpl/packagers/linux/package-issm-linux-binaries.sh

    r24695 r24703  
    7171if [[ ${numMatlabTestsFailed} -ne 0 ]]; then
    7272        echo "One or more MATLAB tests FAILED"
    73         exit 1;
     73        exit 1
    7474else
    7575        echo "All MATLAB tests PASSED"
    … …  
    9090ls -lah ${ISSM_DIR}/${TARBALL}
    9191
    92 echo "Shipping binaries to website"
    93 
    94 # We're using public key authentication method to upload the tarball The
    95 # following lines check to see if the SSH Agent is running. If not, then it is
    96 # started and relevant information is forwarded to a script.
    97 pgrep "ssh-agent" > /dev/null
    98 if [ $? -ne 0 ]; then
    99         echo "SSH Agent is not running. Starting it..."
    100         ssh-agent > ~/.ssh/agent.sh
    101 else
    102         echo "SSH Agent is running..."
    103 fi
    104 
    105 source ~/.ssh/agent.sh
    106 ssh-add ~/.ssh/debian_linux-vm_to_ross
    107 
    108 scp ${TARBALL} ross.ics.uci.edu:/var/www/html/${TARBALL}
     92echo "Transferring binaries to ISSM Web site"
     93scp -i ~/.ssh/debian_linux-vm_to_ross ${TARBALL} jenkins@ross.ics.uci.edu:/var/www/html/${TARBALL}
    10994
    11095if [ $? -ne 0 ]; then
    111         echo "The upload failed."
    112         echo "Perhaps the SSH Agent was started by some other means."
    113         echo "Try killing the agent and running again."
     96        echo "FAILED: Manually check connection"
     97        exit 1
    11498fi

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-with_dakota.sh

    r24700 r24703  
    4242fi
    4343
    44 # # Run tests
    45 # echo "Running tests"
    46 # cd ${ISSM_DIR}/test/NightlyRun
     44# Run tests
     45echo "Running tests"
     46cd ${ISSM_DIR}/test/NightlyRun
    4747
    48 # # Check that MATLAB tests run
    49 # echo "Running MATLAB tests"
     48# Check that MATLAB tests run
     49echo "Running MATLAB tests"
    5050
    51 # rm matlab.log 2> /dev/null
     51rm matlab.log 2> /dev/null
    5252
    53 # # Run MATLAB tests redirecting output to logfile and suppressing output to console
    54 # ${MATLAB_PATH}/bin/matlab -nojvm -nosplash -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log &> /dev/null
     53# Run MATLAB tests redirecting output to logfile and suppressing output to console
     54${MATLAB_PATH}/bin/matlab -nojvm -nosplash -r "try, addpath ${ISSM_DIR}/bin ${ISSM_DIR}/lib; runme(${MATLAB_NROPTIONS}); exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log &> /dev/null
    5555
    56 # # Check that MATLAB did not exit in error
    57 # matlabExitCode=`echo $?`
    58 # matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
     56# Check that MATLAB did not exit in error
     57matlabExitCode=`echo $?`
     58matlabExitedInError=`grep -E "Activation cannot proceed|license" matlab.log | wc -l`
    5959
    60 # if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
    61 #       echo "----------MATLAB exited in error!----------"
    62 #       cat matlab.log
    63 #       echo "-----------End of matlab.log-----------"
     60if [[ ${matlabExitCode} -ne 0 || ${matlabExitedInError} -ne 0 ]]; then
     61        echo "----------MATLAB exited in error!----------"
     62        cat matlab.log
     63        echo "-----------End of matlab.log-----------"
    6464
    65 #       # Clean up execution directory
    66 #       rm -rf ${ISSM_DIR}/execution/*
     65        # Clean up execution directory
     66        rm -rf ${ISSM_DIR}/execution/*
    6767
    68 #       exit 1
    69 # fi
     68        exit 1
     69fi
    7070
    71 # # Check that all MATLAB tests passed
    72 # numMatlabTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
     71# Check that all MATLAB tests passed
     72numMatlabTestsFailed=`cat matlab.log | grep -c -e "FAILED|ERROR"`
    7373
    74 # if [[ ${numMatlabTestsFailed} -ne 0 ]]; then
    75 #       echo "One or more MATLAB tests FAILED"
    76 #       exit 1;
    77 # else
    78 #       echo "All MATLAB tests PASSED"
    79 # fi
     74if [[ ${numMatlabTestsFailed} -ne 0 ]]; then
     75        echo "One or more MATLAB tests FAILED"
     76        exit 1;
     77else
     78        echo "All MATLAB tests PASSED"
     79fi
    8080
    81 # # Check that Python tests run
    82 # echo "Running Python tests"
     81# Check that Python tests run
     82echo "Running Python tests"
    8383
    84 # export PATH="${PATH}:${ISSM_DIR}/bin"
    85 # export PYTHONPATH="${ISSM_DIR}/src/m/dev"
    86 # export PYTHONSTARTUP="${PYTHONPATH}/devpath.py"
    87 # export PYTHONUNBUFFERED=1 # We don't want Python to buffer output, otherwise issm.exe output is not captured
     84export PATH="${PATH}:${ISSM_DIR}/bin"
     85export PYTHONPATH="${ISSM_DIR}/src/m/dev"
     86export PYTHONSTARTUP="${PYTHONPATH}/devpath.py"
     87export PYTHONUNBUFFERED=1 # We don't want Python to buffer output, otherwise issm.exe output is not captured
    8888
    89 # rm python.log 2> /dev/null
    90 # ./runme.py ${PYTHON_NROPTIONS} &> python.log 2>&1
     89rm python.log 2> /dev/null
     90./runme.py ${PYTHON_NROPTIONS} &> python.log 2>&1
    9191
    92 # # Check that Python did not exit in error
    93 # pythonExitCode=`echo $?`
    94 # pythonExitedInError=`grep -E "Error|Traceback|bad interpreter" python.log | wc -l`
     92# Check that Python did not exit in error
     93pythonExitCode=`echo $?`
     94pythonExitedInError=`grep -E "Error|Traceback|bad interpreter" python.log | wc -l`
    9595
    96 # if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
    97 #       echo "----------Python exited in error!----------"
    98 #       cat python.log
    99 #       echo "-----------End of python.log-----------"
     96if [[ ${pythonExitCode} -ne 0 || ${pythonExitedInError} -ne 0 ]]; then
     97        echo "----------Python exited in error!----------"
     98        cat python.log
     99        echo "-----------End of python.log-----------"
    100100
    101 #       # Clean up execution directory
    102 #       rm -rf ${ISSM_DIR}/execution/*
     101        # Clean up execution directory
     102        rm -rf ${ISSM_DIR}/execution/*
    103103
    104 #       exit 1
    105 # fi
     104        exit 1
     105fi
    106106
    107 # # Check that all Python tests passed
    108 # numPythonTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
     107# Check that all Python tests passed
     108numPythonTestsFailed=`cat python.log | grep -c -e "FAILED|ERROR"`
    109109
    110 # if [[ ${numPythonTestsFailed} -ne 0 ]]; then
    111 #       echo "One or more Python tests FAILED"
    112 #       exit 1
    113 # else
    114 #       echo "All Python tests PASSED"
    115 # fi
     110if [[ ${numPythonTestsFailed} -ne 0 ]]; then
     111        echo "One or more Python tests FAILED"
     112        exit 1
     113else
     114        echo "All Python tests PASSED"
     115fi
    116116
    117117# Create tarball
    … …  
    137137        echo "FAILED: Manually check connection"
    138138        exit 1
    139 else
    140         echo "SUCCESS"
    141139fi

  • issm/trunk-jpl/packagers/mac/package-issm-mac-binaries.sh

    r24696 r24703  
    6666if [[ ${numMatlabTestsFailed} -ne 0 ]]; then
    6767        echo "One or more MATLAB tests FAILED"
    68         exit 1;
     68        exit 1
    6969else
    7070        echo "All MATLAB tests PASSED"
    … …  
    8585ls -lah ${ISSM_DIR}/${TARBALL}
    8686
    87 echo "Shipping binaries to website"
    88 
    89 # We're using public key authentication method to upload the tarball The
    90 # following lines check to see if the SSH Agent is running. If not, then it is
    91 # started and relevant information is forwarded to a script.
    92 pgrep "ssh-agent" > /dev/null
    93 if [ $? -ne 0 ]; then
    94         echo "SSH Agent is not running. Starting it..."
    95         ssh-agent > ~/.ssh/agent.sh
    96 else
    97         echo "SSH Agent is running..."
    98 fi
    99 
    100 source ~/.ssh/agent.sh
    101 ssh-add ~/.ssh/pine_island_to_ross
    102 
    103 scp ${TARBALL} ross.ics.uci.edu:/var/www/html/${TARBALL}
     87echo "Transferring binaries to ISSM Web site"
     88scp -i ~/.ssh/pine_island_to_ross ${TARBALL} jenkins@ross.ics.uci.edu:/var/www/html/${TARBALL}
    10489
    10590if [ $? -ne 0 ]; then
    106         echo "The upload failed."
    107         echo "Perhaps the SSH Agent was started by some other means."
    108         echo "Try killing the agent and running again."
     91        echo "FAILED: Manually check connection"
     92        exit 1
    10993fi
Note: See TracChangeset for help on using the changeset viewer.