Commit 62c75e81 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Drop nightlies config for user lcgnight, keep only sftnight (CORALCOOL-2191).


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19899 4525493e-7705-40b1-a816-d608a930855b
parent 6918cd5c
...@@ -225,9 +225,6 @@ class DBPreparer: ...@@ -225,9 +225,6 @@ class DBPreparer:
# AV Fix for bug #28349 (use USERNAME instead of USER on Windows) # AV Fix for bug #28349 (use USERNAME instead of USER on Windows)
if "USER" in self.env: user=self.env["USER"] if "USER" in self.env: user=self.env["USER"]
else: user=self.env["USERNAME"] else: user=self.env["USERNAME"]
# Temporarily keep lcgnight in parallel to sftnight (bug #100746)
# The dblookup.xml file will only contain entries for sftnight
if user == "lcgnight": user="sftnight"
return "COOL-%s-%s/%s"%(self.backend,user,self.name) return "COOL-%s-%s/%s"%(self.backend,user,self.name)
def DropDB(self): def DropDB(self):
...@@ -673,23 +670,21 @@ class DatabaseTest(StandardTest): ...@@ -673,23 +670,21 @@ class DatabaseTest(StandardTest):
def PrepareEnv(self,env): def PrepareEnv(self,env):
# Environment for the nightlies (user lcgnight/sftnight) - START # Environment for the nightlies (user sftnight) - START
# Keep both old user lcgnight and new user sftnight (see bug #100746) # Drop old user lcgnight, keep only sftnight (see CORALCOOL-2191)
if sys.platform.startswith("win") : if sys.platform.startswith("win") :
raise RuntimeError("Windows is no longer supported!") raise RuntimeError("Windows is no longer supported!")
elif sys.platform.startswith("darwin") and "USER" in env and \ elif sys.platform.startswith("darwin") and "USER" in env and \
( env["USER"] == "lcgnight" or \ env["USER"] == "sftnight" :
env["USER"] == "sftnight" ) : # Use credentials from $HOME/private on Mac (bug #86463)
# Use credentials from $HOME/private on MacOSX (AFS not available)
env["CORAL_AUTH_PATH"] = os.path.join(env["HOME"],"private") env["CORAL_AUTH_PATH"] = os.path.join(env["HOME"],"private")
env["CORAL_DBLOOKUP_PATH"] = env["CORAL_AUTH_PATH"] env["CORAL_DBLOOKUP_PATH"] = env["CORAL_AUTH_PATH"]
elif sys.platform.startswith("linux") and "USER" in env and \ elif sys.platform.startswith("linux") and "USER" in env and \
( env["USER"] == "lcgnight" or env["USER"] == "sftnight" :
env["USER"] == "sftnight" ) : # Use credentials from POOL AFS area on Linux (bug #86463)
# Use credentials from POOL AFS area on Linux
env["CORAL_AUTH_PATH"] = "/afs/cern.ch/sw/lcg/app/pool/db" env["CORAL_AUTH_PATH"] = "/afs/cern.ch/sw/lcg/app/pool/db"
env["CORAL_DBLOOKUP_PATH"] = env["CORAL_AUTH_PATH"] env["CORAL_DBLOOKUP_PATH"] = env["CORAL_AUTH_PATH"]
# Environment for the nightlies (user lcgnight/sftnight) - END # Environment for the nightlies (user sftnight) - END
# Path to authentication.xml (CORAL_AUTH_PATH) # Path to authentication.xml (CORAL_AUTH_PATH)
if "CORAL_AUTH_PATH" not in env: if "CORAL_AUTH_PATH" not in env:
......
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