From 1daa6648aea7f507e0deb1086b5c76f891d1fb8f Mon Sep 17 00:00:00 2001 From: Brian Lin Date: Wed, 28 Sep 2016 13:00:40 -0500 Subject: [PATCH] Restart the CE if it's already running to acccommodate bad packaging in htcondor-ce-2.0.8-2 --- osgtest/tests/test_19_condorce.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/osgtest/tests/test_19_condorce.py b/osgtest/tests/test_19_condorce.py index d6be8f51..63e9ce13 100644 --- a/osgtest/tests/test_19_condorce.py +++ b/osgtest/tests/test_19_condorce.py @@ -99,6 +99,17 @@ def test_05_start_condorce(self): core.config['condor-ce.collectorlog'] = collector_log.strip().strip() if service.is_running('condor-ce'): + # Required to accept changes to the mapfile, which caused + # issues in the nightly due to bad htcondor-ce-2.0.8-2 + # packaging remove after OSG 3.3.17. We don't use service.stop() + # because it only stops services that we've started + if core.el_release() < 7: + command = ('service', 'condor-ce', 'stop') + else: + command = ('systemctl', 'stop', 'condor-ce') + core.check_system(command, 'Stop condor-ce service') + service.start('condor-ce') + core.state['condor-ce.schedd-ready'] = True self.skip_ok('already running') service.start('condor-ce')