Skip to content

Commit 756ce33

Browse files
committed
Include osg-development to satisfy reqs for osg-tested-internal
1 parent 186d3f7 commit 756ce33

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

osgtest/tests/special_install.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,13 @@ def test_02_install_packages(self):
3232

3333
# HACK: Install Slurm and osg-tested-internal out of development-like repos.
3434
# SOFTWARE-1733 may one day give us a generalized solution.
35+
devops_repos = ['osg-development']
36+
# FIXME: Upon release of OSG 3.5.0, this list does not need to contain osg-development
3537
if core.osg_release() > '3.4':
36-
devops_repo = 'devops-itb'
37-
else:
38-
devops_repo = 'osg-development'
38+
devops_repos += ['devops-itb']
3939

4040
if 'osg-tested-internal' in pkg_repo_dict or 'slurm' in pkg_repo_dict:
41-
pkg_repo_dict.update(dict((x, [devops_repo]) for x in core.SLURM_PACKAGES + ['osg-tested-internal']))
41+
pkg_repo_dict.update(dict((x, devops_repos) for x in core.SLURM_PACKAGES + ['osg-tested-internal']))
4242

4343
# HACK: Install x509-scitokens-issuer-client out of development (SOFTWARE-3649)
4444
if 'xrootd-scitokens' in pkg_repo_dict:

0 commit comments

Comments
 (0)