Commit 44b700ee authored by js9's avatar js9

merge from 2.3RC: more updates to svn repo location.


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@15739 18c085ea-50e0-402c-830e-de6fd14e8384
parent cb5c038a
......@@ -5,7 +5,7 @@ cd visit_run_tests
# Get the latest version of the scripts
rm -rf svn_bin
svn co svn+ssh://brugger@svn.nersc.gov/svn/visit/trunk/src/svn_bin
svn co svn+ssh://brugger@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/src/svn_bin
cd svn_bin
# Run the test suite.
......
......@@ -446,6 +446,9 @@
# to current releases 4.2.6 and 1.8.7 respectively. I went ahead and added
# --without-libtool to gdal's configure to fix problems I see on RHEL5.
#
# Jeremy Meredith, Tue Aug 9 17:19:55 EDT 2011
# Updated the subversion host/path.
#
# *****************************************************************************
......@@ -777,9 +780,9 @@ fi
export SVN_ANON_ROOT_PATH="http://portal.nersc.gov/svn/visit"
# Setup svn path: use SVN_NERSC_NAME if set
if test -z "$SVN_NERSC_NAME" ; then
export SVN_REPO_ROOT_PATH="svn+ssh://svn.nersc.gov/svn/visit"
export SVN_REPO_ROOT_PATH="svn+ssh://portal-auth.nersc.gov/project/projectdirs/visit/svn/visit"
else
export SVN_REPO_ROOT_PATH="svn+ssh://$SVN_NERSC_NAME@svn.nersc.gov/svn/visit"
export SVN_REPO_ROOT_PATH="svn+ssh://$SVN_NERSC_NAME@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit"
fi
############################################################################
......
......@@ -20,6 +20,9 @@
# Cyrus Harrison, Tue Oct 20 11:38:04 PDT 2009
# Changed the way permissions are set for posting and reindexing.
#
# Jeremy Meredith, Tue Aug 9 17:19:55 EDT 2011
# Updated the subversion host/path.
#
# *****************************************************************************
import sys,os,time,datetime,glob,socket
......@@ -91,7 +94,7 @@ def get_svn_root():
sys.stderr.write("<Error: Could not obtain nersc svn user name from environment.")
sys.stderr.write("Make sure SVN_NERSC_NAME is set!>\n")
sys.exit(-1)
return "svn+ssh://%s@svn.nersc.gov/svn/visit/trunk/src" % os.environ["SVN_NERSC_NAME"]
return "svn+ssh://%s@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/src" % os.environ["SVN_NERSC_NAME"]
def create_run_dir(mode):
"""
......
......@@ -9,6 +9,9 @@
#
# Eric Brugger, Tue Apr 12 10:53:02 PDT 2011
# Removed the specular lighting tests from the skip list.
#
# Jeremy Meredith, Tue Aug 9 17:19:55 EDT 2011
# Updated the subversion host/path.
#
# Determine the users name and e-mail address.
......@@ -156,23 +159,23 @@ if test "$debug" = "true" ; then
fi
if test "$branch" = "trunk" ; then
if test "$revision" = "latest" ; then
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/trunk/src > buildlog 2>&1
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/trunk/data >> buildlog 2>&1
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/trunk/test >> buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/src > buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/data >> buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/test >> buildlog 2>&1
else
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/trunk/src -r $revision > buildlog 2>&1
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/trunk/data -r $revision >> buildlog 2>&1
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/trunk/test -r $revision >> buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/src -r $revision > buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/data -r $revision >> buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/test -r $revision >> buildlog 2>&1
fi
else
if test "$revision" = "latest" ; then
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/branches/2.2RC/src > buildlog 2>&1
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/branches/2.2RC/data >> buildlog 2>&1
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/branches/2.2RC/test >> buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/branches/2.2RC/src > buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/branches/2.2RC/data >> buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/branches/2.2RC/test >> buildlog 2>&1
else
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/branches/2.2RC/src -r $revision > buildlog 2>&1
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/branches/2.2RC/data -r $revision >> buildlog 2>&1
svn co svn+ssh://$userNersc@svn.nersc.gov/svn/visit/branches/2.2RC/test -r $revision >> buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/branches/2.2RC/src -r $revision > buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/branches/2.2RC/data -r $revision >> buildlog 2>&1
svn co svn+ssh://$userNersc@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/branches/2.2RC/test -r $revision >> buildlog 2>&1
fi
fi
if test "$debug" = "true" ; then
......
......@@ -241,9 +241,13 @@
#
# Jeremy Meredith, Tue Aug 9 11:36:34 EDT 2011
# Removed Sean from list of devs always getting results.
#
# Jeremy Meredith, Tue Aug 9 17:19:55 EDT 2011
# Updated the subversion host/path.
#
# ----------------------------------------------------------------------------
dateTag=`date +%y%b%d`
svnHost=svn.nersc.gov
svnHost=portal-auth.nersc.gov
rootTestDir=/project/projectdirs/visit/test/trunk
errorLogFile=$rootTestDir/testLogFile_$dateTag
modifiersFile=$rootTestDir/nersc_repo_modifiers_since_last_pass
......
......@@ -123,9 +123,13 @@
#
# Mark C. Miller, Mon Apr 12 22:40:12 PDT 2010
# Replaced mpich path with path to 1.2.7p1 mpich.
#
# Jeremy Meredith, Tue Aug 9 17:19:55 EDT 2011
# Updated the subversion host/path.
#
# ----------------------------------------------------------------------------
dateTag=`date +%y%b%d`
svnHost=svn.nersc.gov
svnHost=portal-auth.nersc.gov
rootTestDir=/groups/visit/miller/nersc_repo_test/trunk
errorLogFile=$rootTestDir/testLogFile_$dateTag
modifiersFile=$rootTestDir/nersc_repo_modifiers_since_last_pass
......
......@@ -34,7 +34,7 @@
if [ "$SVN_NERSC_NAME" = "" ] ; then
echo "You must define the environment variable SVN_NERSC_NAME to use these scripts."
echo "This should be your username on svn.nersc.gov"
echo "This should be your username on portal-auth.nersc.gov"
exit 1
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment