Skip to content

Commit

Permalink
Update collection name on TTS and how the site is determined
Browse files Browse the repository at this point in the history
  • Loading branch information
mfisherlevine committed Feb 22, 2023
1 parent 2c365d1 commit 80e25ed
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion python/lsst/summit/utils/butlerUtils.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def getLatissDefaultCollections():
site = ''

if site == 'tucson':
collections.append("LATISS-test-data-TTS")
collections.append("LATISS-test-data")
return collections
if site == 'summit':
collections.append("LATISS-test-data")
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/summit/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ def getSite():
"""
# All nublado instances guarantee that EXTERNAL_URL is set and uniquely
# identifies it.
location = os.getenv('EXTERNAL_URL', "")
location = os.getenv('EXTERNAL_INSTANCE_URL', "")
if location == "https://tucson-teststand.lsst.codes":
return 'tucson'
elif location == "https://summit-lsp.lsst.codes":
Expand Down
2 changes: 1 addition & 1 deletion tests/SConscript
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ from lsst.sconsUtils import env, scripts
scripts.BasicSConscript.tests(pyList=[])

passThrough = ['DAF_BUTLER_REPOSITORY_INDEX', # for repo locations
'EXTERNAL_URL', # needed to determine site location - see utils.getSite()
'EXTERNAL_INSTANCE_URL', # needed to determine site location - see utils.getSite()
'HOSTNAME', # needed to determine site location - see utils.getSite()
'PGPASSFILE', # needed for butler authentication
'PGUSER', # needed for butler authentication
Expand Down

0 comments on commit 80e25ed

Please sign in to comment.