Skip to content

Commit

Permalink
Merge pull request #222 from brianhlin/SOFTWARE-4614.condor-multi-con…
Browse files Browse the repository at this point in the history
…fig-dir

Add support for multiple dirs specified in LOCAL_CONFIG_DIR
  • Loading branch information
brianhlin authored May 11, 2021
2 parents 5f0dd38 + 3276bb2 commit 04dd326
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion osgtest/tests/test_100_condor.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import re
from os.path import join

import osgtest.library.core as core
Expand All @@ -24,7 +25,8 @@ def test_01_start_condor(self):
core.state['condor.running-service'] = True
return

core.config['condor.personal_condor'] = join(condor.config_val('LOCAL_CONFIG_DIR'), '99-personal-condor.conf')
config_dirs = re.split(r'[, ]+', condor.config_val('LOCAL_CONFIG_DIR'))
core.config['condor.personal_condor'] = join(config_dirs[-1], '99-personal-condor.conf')
files.write(core.config['condor.personal_condor'], personal_condor_config, owner='condor', chmod=0o644)

core.config['condor.collectorlog_stat'] = core.get_stat(core.config['condor.collectorlog'])
Expand Down

0 comments on commit 04dd326

Please sign in to comment.