Skip to content

Commit 03e313e

Browse files
committed
Apply regex formatting/mapfiles.d to > HTCondor-CE 5.0.0
This fixes the currently failing HTCondor-CE CI tests and is safe because 5.0.0 will not be released
1 parent 1fad435 commit 03e313e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

osgtest/tests/test_190_condorce.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ def test_02_scitoken_mapping(self):
4747
# Write the mapfile to the admin mapfile directory with the regex format for the issuer
4848
# required by 'CERTIFICATE_MAPFILE_ASSUME_HASH_KEYS = True'
4949
# https://github.com/htcondor/htcondor-ce/pull/425
50-
if condorce_version >= '5.1.0':
50+
# We apply this to HTCondor-CE 5 as a whole for the benefit of the HTCondor-CE CI tests
51+
# This is ok even though these changes will only make it into 5.1.0 because 5.0.0 will not be released
52+
if condorce_version >= '5.0.0':
5153
match_str = r'/https:\/\/demo.scitokens.org,.*/'
5254
core.config['condor-ce.mapfile'] = '/etc/condor-ce/mapfiles.d/01-osg-test.conf'
5355
else:

0 commit comments

Comments
 (0)