Changeset 631

Timestamp:

Oct 17, 2007 12:56:13 PM (12 years ago)

Author:

jpfasano

Message:

userConfig now has svn path for math01 machine
osCommand now has alternate implementation for older versions of python

Location:

branches/testScripts

Files:

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

branches/testScripts/NBosCommand.py

@@ -1 +1 @@
 #! /usr/bin/env python
 
-import subprocess
+from socket import gethostname
 
 #------------------------------------------------------------------------
@@ -9 +9 @@
 #------------------------------------------------------------------------
 def run(cmd) :
-  p=subprocess.Popen(cmd,shell=True,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-  cmdStdout,cmdStderr=p.communicate()
-  cmdRc=p.returncode
-  retVal = { 'returnCode':cmdRc, 'stdout':cmdStdout, 'stderr':cmdStderr }
-  return retVal 
+
+  if gethostname()=='math01.watson.ibm.com' :
+
+    # this machine has a back level of python, so must use an older
+    # techniques to implement this function.  This implementation
+    # runs the command in the same process as the script.
+    # This has the problem that if the command crashes, it will bring
+    # down the script. Another problem is that stderr and stdout are
+    # mingled together
+
+    import commands
+    result = commands.getstatusoutput(cmd)
+    retVal = { 'returnCode':result[0], 'stdout':result[1], 'stderr':'' }
+    return retVal
+
+  else :
+
+    import subprocess
+ 
+    p=subprocess.Popen(cmd,shell=True,\
+                       stdout=subprocess.PIPE,\
+                       stderr=subprocess.PIPE)
+    cmdStdout,cmdStderr=p.communicate()
+    cmdRc=p.returncode
+    retVal = { 'returnCode':cmdRc, 'stdout':cmdStdout, 'stderr':cmdStderr }
+    return retVal 
 
 

branches/testScripts/NBuserConfig.py

@@ -19 +19 @@
 elif gethostname()=='math01.watson.ibm.com' :
   NIGHTLY_BUILD_ROOT_DIR = '/u/jpfasano/COIN/nbTest'
+elif gethostname()=='kmartin-maclt.local' :
+  NIGHTLY_BUILD_ROOT_DIR = '/Users/kmartin/COIN'
 else :
-  NIGHTLY_BUILD_ROOT_DIR = '/Users/kmartin/COIN'
+  NIGHTLY_BUILD_ROOT_DIR = 'xxx'
 
-SVNPATH_PREFIX=''
-  
+#----------------------------------------------------------------------
+# Define directory where svn is located.
+# If svn is in the default path, then this can be set to an empty string
+#----------------------------------------------------------------------
+if gethostname()=='math01.watson.ibm.com' :
+  SVNPATH_PREFIX='/gsa/yktgsa/projects/o/oslos/local/bin'
+elif gethostname()=='kmartin-maclt.local' :
+  SVNPATH_PREFIX='/usr/local/bin/'
+else :
+  SVNPATH_PREFIX=''
+
 
 #----------------------------------------------------------------------
@@ -63 +74 @@
   MY_EMAIL_ADDR='jpfasano _AT_ us _DOT_ ibm _DOT_ com'
   SEND_MAIL_TO_PROJECT_MANAGER=0
-else :
+elif gethostname()=='kmartin-maclt.local' :
   SMTP_SERVER_NAME = 'gsbims.uchicago.edu'
   SMTP_SERVER_PORT =587
@@ -73 +84 @@
   MY_EMAIL_ADDR='kipp _DOT_ martin _AT_ chicagogsb _DOT_ edu'
   SEND_MAIL_TO_PROJECT_MANAGER=0
-  SVNPATH_PREFIX='/usr/local/bin/'
+else :
+  SMTP_SERVER_NAME = 'xxx.smtp.server.name'
+  SMTP_SERVER_PORT =25
+  SMTP_SSL_SERVER = 0
+  SMTP_USER_NAME = 'xxxx'
+  SMTP_PASSWORD_FILENAME = '/xxx/yyy/smtpPassWordFile'
+
+  SENDER_EMAIL_ADDR='xxx _AT_ yyyy _DOT_ edu'
+  MY_EMAIL_ADDR='xxx _AT_ yyyy _DOT_ edu'
+  SEND_MAIL_TO_PROJECT_MANAGER=0