From 2400fb30bd61c34cd56e4d50216e99f523c6fe4f Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Thu, 28 Mar 2019 13:39:11 -0500 Subject: [PATCH] Install x509-scitokens-issuer-client out of development for scitokens tests (SOFTWARE-3649) --- osgtest/tests/special_install.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/osgtest/tests/special_install.py b/osgtest/tests/special_install.py index 60bbbeb7..3f639702 100644 --- a/osgtest/tests/special_install.py +++ b/osgtest/tests/special_install.py @@ -30,11 +30,15 @@ def test_02_install_packages(self): fail_msg = '' pkg_repo_dict = OrderedDict((x, core.options.extrarepos) for x in core.options.packages) - # FIXME: Install slurm out of contrib if we're running 'All' tests until - # SOFTWARE-1733 gives us a generalized solution + # HACK: Install slurm out of development if we're running 'All' tests. + # SOFTWARE-1733 may one day give us a generalized solution. if 'osg-tested-internal' in pkg_repo_dict or 'slurm' in pkg_repo_dict: pkg_repo_dict.update(dict((x, ['osg-development']) for x in core.SLURM_PACKAGES)) + # HACK: Install x509-scitokens-issuer-client out of development (SOFTWARE-3649) + if 'xrootd-scitokens' in pkg_repo_dict: + pkg_repo_dict["x509-scitokens-issuer-client"] = ["osg-development"] + for pkg, repos in pkg_repo_dict.items(): # Do not try to re-install packages if core.rpm_is_installed(pkg):