Changeset 8181


Ignore:
Timestamp:
05/06/11 15:01:38 (14 years ago)
Author:
Mathieu Morlighem
Message:

some modif for new config files

Location:
issm/trunk/cron
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/cron/configs/linux64_larour

    r6108 r8181  
    1414ISSM_ARCH="linux-gnu-amd64"
    1515
    16 #Operating System
    17 OS="linux64"
     16#Machine configuration
     17MACHINE="astrid"
    1818
    1919#MATLAB path

  • issm/trunk/cron/configs/linux64_morlighem_daily

    r6288 r8181  
    1414ISSM_ARCH="linux-gnu-amd64"
    1515
    16 #Operating System
    17 OS="linux64"
     16#Machine configuration
     17MACHINE="astrid"
    1818
    1919#MATLAB path

  • issm/trunk/cron/configs/linux64_morlighem_nightly

    r6288 r8181  
    1414ISSM_ARCH="linux-gnu-amd64"
    1515
    16 #Operating System
    17 OS="linux64"
     16#Machine configuration
     17MACHINE="astrid"
    1818
    1919#MATLAB path

  • issm/trunk/cron/configs/linux64_morlighem_validation

    r8163 r8181  
    1313ISSM_ARCH="linux-gnu-amd64"
    1414
    15 #Operating System
    16 OS="linux64"
     15#Machine configuration
     16MACHINE="astrid"
    1717
    1818#MATLAB path

  • issm/trunk/cron/configs/linux64_seroussi

    r6108 r8181  
    1313ISSM_ARCH="linux-gnu-amd64"
    1414
    15 #Operating System
    16 OS="linux64"
     15#Machine configuration
     16MACHINE="astrid"
    1717
    1818#MATLAB path

  • issm/trunk/cron/configs/macosx32_seroussi

    r6108 r8181  
    1313ISSM_ARCH="macosx-gnu"
    1414
    15 #Operating System
    16 OS="macosx32"
     15#Machine configuration
     16MACHINE="macmathieu"
    1717
    1818#MATLAB path

  • issm/trunk/cron/configs/winxp32_larour

    r6108 r8181  
    1313ISSM_ARCH="cygwin-intel"
    1414
    15 #Operating System
    16 OS="winxp32"
     15#Machine configuration
     16MACHINE="wineric"
    1717
    1818#MATLAB path

  • issm/trunk/cron/nightlyrun.sh

    r8095 r8181  
    2929{
    3030        #return host name depending on the OS
    31         if [ "$1" = "winxp32" ]
     31        if [ "$1" = "wineric" ]
    3232        then
    3333                HOST_NAME=`hostname`;
    … …  
    6060#Initialize variables {{{1
    6161TODAY=$(todaydate);
    62 HOST_NAME=$(host_name $OS);
     62HOST_NAME=$(host_name $MACHINE);
    6363START_TIME=$(timer);
    6464ISSM_RELEASE=$(basename $(echo $REPOSITORY));
    … …  
    119119                if [ "$ep" == "petsc" ]
    120120                then
    121                         cp configs/3.1-p7/$OS/* .
     121                        cp configs/3.1-p7/$MACHINE/* .
    122122                else
    123                         cp configs/$OS/* .
     123                        cp configs/$MACHINE/* .
    124124                fi
    125125                ./install.sh $NUMCPUS_INSTALL
    … …  
    164164        make distclean
    165165        sh scripts/automakererun.sh
    166         #sh configs/$OS/$OS.sh.petsc2 #use petsc2 for now
    167         sh configs/$OS/$OS.sh #switch to petsc3 to debug
     166        sh configs/$MACHINE/configure.sh #switch to petsc3 to debug
    168167
    169168        #4: compile and install ISSM
    170         if [ "$OS" = "winxp32" ]
     169        if [ "$MACHINE" = "wineric" ]
    171170        then
    172171                cd $ISSM_TIER/src/c
    … …  
    196195
    197196#Prepare run
    198 #Windows hack for startup.m {{{1
    199 #windows environments: ISSM_TIER_WIN variable not correctly picked up when using
    200 #the cron job. just get startup to take the ISSM_TIER variable as the pwd:
    201 if [ "$OS" = "winxp32" ]
    202 then
    203         cat startup.m | sed 's/clear status/clear status; ISSM_TIER=pwd;/g' > startup.m.bak
    204         mv startup.m.bak startup.m
    205 fi
    206 #}}}
    207197#create softlink to startup {{{1
    208198cd $ISSM_TIER/test/NightlyRun/
    … …  
    219209user:      $(echo $USER)
    220210host:      $(echo $HOST_NAME)
    221 OS:        $(echo $OS)
     211OS:        $(echo $MACHINE)
    222212release:   $(echo $ISSM_RELEASE)
    223213init_path: $(echo $INIT_PATH)
    … …  
    312302        for i in `echo $MAILINGLIST`; do
    313303
    314                 if [ "$OS" = "winxp32" ]
     304                if [ "$MACHINE" = "wineric" ]
    315305                then
    316                         email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , operating system: $OS, host: $HOST_NAME, user: $USER. " $i < $ISSM_TIER/test/Verification/NightlyRun/report.html
     306                        email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , configuration: $MACHINE, host: $HOST_NAME, user: $USER. " $i < $ISSM_TIER/test/Verification/NightlyRun/report.html
    317307                else
    318                         if [ "$OS" = "linux64" ]
     308                        if [ "$MACHINE" = "astrid" ]
    319309                        then
    320310cat - $ISSM_TIER/nightlylog/report.html <<HERE | /usr/lib/sendmail  -oi -t
    321311From: "ISSM Nightly run" <$EMAIL_ADRESS>
    322312To: $i
    323 Subject: Nightly runs of $ISSM_RELEASE, operating system: $OS, host: $HOST_NAME, user: $USER.
     313Subject: Nightly runs of $ISSM_RELEASE, configuration: $MACHINE, host: $HOST_NAME, user: $USER.
    324314Mime-Version: 1.0
    325315Content-Type: text/html
    … …  
    329319From: "ISSM Nightly run" <$EMAIL_ADRESS>
    330320To: $i
    331 Subject: Nightly runs of $ISSM_RELEASE, operating system: $OS, host: $HOST_NAME, user: $USER.
     321Subject: Nightly runs of $ISSM_RELEASE, configuration: $MACHINE, host: $HOST_NAME, user: $USER.
    332322Mime-Version: 1.0
    333323Content-Type: text/html
Note: See TracChangeset for help on using the changeset viewer.