Changeset 618

Timestamp:

Oct 15, 2007 2:10:33 PM (12 years ago)

Author:

jpfasano

Message:

emailed messages now contain some information about the host machine (name
and OS).
userConfig variables are conditionally set based on hostname

Location:

branches/testScripts

Files:

• NBemail.py (modified) (2 diffs)
• NBuserConfig.py (modified) (3 diffs)

branches/testScripts/NBemail.py

@@ -3 +3 @@
 import os
 import sys
+from socket import gethostname 
 import smtplib
 
@@ -37 +38 @@
 
   emailMsg  = "'" + cmd + "' from directory " + curDir + " failed.\n\n"
-  emailMsg += "Operating System: "+os.name+"\n"
+
+  emailMsg += "Operating System: "+sys.platform+" "+os.name+"\n"
+  emailMsg += "Host name: "+gethostname()+"\n\n"
+
   emailMsg += "'" + cmd + "' messages are:\n" 
   emailMsg += cmdMsgs

branches/testScripts/NBuserConfig.py

@@ -1 +1 @@
 #! /usr/bin/env python
+
+from socket import gethostname
 
 #----------------------------------------------------------------------
@@ -12 +14 @@
 #   done. If the directory does not exist, it will be created.
 #----------------------------------------------------------------------
-NIGHTLY_BUILD_ROOT_DIR = '/home/jp/COIN'
+if gethostname()=='ubuntu' :
+  NIGHTLY_BUILD_ROOT_DIR = '/home/jp/COIN'
+elif gethostname()=='math01.watson.ibm.com' :
+  NIGHTLY_BUILD_ROOT_DIR = '/u/jpfasano/COIN/nbTest'
+else :
+  NIGHTLY_BUILD_ROOT_DIR = 'xxxxx'
+  
 
 #----------------------------------------------------------------------
@@ -34 +42 @@
 #                 project manager.
 #----------------------------------------------------------------------
-#SMTP_SERVER_NAME = 'outgoing.verizon.net'
-#SMTP_SERVER_PORT = 25
-#SMTP_SSL_SERVER = 0
-#SMTP_USER_NAME = 'jpfasano'
+if gethostname()=='ubuntu' or gethostname()=='math01.watson.ibm.com':
+  #SMTP_SERVER_NAME = 'outgoing.verizon.net'
+  #SMTP_SERVER_PORT = 25
+  #SMTP_SSL_SERVER = 0
+  #SMTP_USER_NAME = 'jpfasano'
 
-SMTP_SERVER_NAME = 'smtp.gmail.com'
-SMTP_SERVER_PORT = 587
-SMTP_SSL_SERVER = 1
-SMTP_USER_NAME = 'jpfasano _AT_ gmail _DOT_ com'
-SMTP_PASSWORD_FILENAME = '/home/jp/bin/smtpPwFile'
+  SMTP_SERVER_NAME = 'smtp.gmail.com'
+  SMTP_SERVER_PORT = 587
+  SMTP_SSL_SERVER = 1
+  SMTP_USER_NAME = 'jpfasano _AT_ gmail _DOT_ com'
+  if gethostname()=='ubuntu' :
+    SMTP_PASSWORD_FILENAME = '/home/jp/bin/smtpPwFile'
+  else :
+    SMTP_PASSWORD_FILENAME = '/u/jpfasan/COIN/bin/smtpPwFile'
 
-SENDER_EMAIL_ADDR='jpfasano _AT_ verizon _DOT_ net'
-MY_EMAIL_ADDR='jpfasano _AT_ us _DOT_ ibm _DOT_ com'
-SEND_MAIL_TO_PROJECT_MANAGER=0
-#SMTP_SERVER_NAME = 'gsbims.chicagogsb.edu'
+  SENDER_EMAIL_ADDR='jpfasano _AT_ verizon _DOT_ net'
+  MY_EMAIL_ADDR='jpfasano _AT_ us _DOT_ ibm _DOT_ com'
+  SEND_MAIL_TO_PROJECT_MANAGER=0
+else :
+  SMTP_SERVER_NAME = 'xxxxx'
+  SMTP_SERVER_PORT = 25
+  SMTP_SSL_SERVER = 0
+  SMTP_USER_NAME = 'xxxx _AT_ xxxx _DOT_ com'
+  SMTP_PASSWORD_FILENAME = '/home/userid/xxxxx'
+
+  SENDER_EMAIL_ADDR='xxxxx _AT_ xxxxx _DOT_ net'
+  MY_EMAIL_ADDR='xxxxx _AT_ xxxxx _DOT_ xxxxx _DOT_ com'
+  SEND_MAIL_TO_PROJECT_MANAGER=0