Merge pull request #164 from matyasselmeci/pr/scitokens-issuer-client

Install x509-scitokens-issuer-client out of development for scitokens…
opensciencegrid · Apr 8, 2019 · 2e7a903 · 2e7a903
2 parents 5af9ca2 + 2400fb3
commit 2e7a903
Showing 1 changed file with 6 additions and 2 deletions.
diff --git 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):