Get rid of EL6 Slurm conditionals

Author: brianhlin

osgtest/tests/test_290_slurm.py

@@ -116,24 +116,18 @@ def test_02_start_slurmdbd(self):
         core.check_system(command, 'add slurm cluster')
 
     def test_03_start_slurm(self):
-        core.config['slurm.service-name'] = 'slurm'
-        if core.el_release() >= 7:
-            core.config['slurm.service-name'] += 'd'
-            core.config['slurm.ctld-service-name'] = 'slurmctld'
+        core.config['slurm.service-name'] = 'slurmd'
+        core.config['slurm.ctld-service-name'] = 'slurmctld'
         core.state['%s.started-service' % core.config['slurm.service-name']] = False
         self.slurm_reqs()
         self.skip_ok_if(service.is_running(core.config['slurm.service-name']), 'slurm already running')
 
         stat = core.get_stat(CTLD_LOG)
 
-        if core.el_release() >= 7:
-            # slurmctld is handled by /etc/init.d/slurm on EL6
-            command = ['slurmctld']
-            core.check_system(command, 'enable slurmctld')
-            service.check_start(core.config['slurm.service-name'])
-            service.check_start(core.config['slurm.ctld-service-name'])
-        else:
-            service.check_start(core.config['slurm.service-name'])
+        command = ['slurmctld']
+        core.check_system(command, 'enable slurmctld')
+        service.check_start(core.config['slurm.service-name'])
+        service.check_start(core.config['slurm.ctld-service-name'])
 
         core.monitor_file(CTLD_LOG,
                           stat,

osgtest/tests/test_740_slurm.py

@@ -13,8 +13,7 @@ def test_01_stop_slurm(self):
         self.slurm_reqs()
         self.skip_ok_unless(core.state['%s.started-service' % core.config['slurm.service-name']], 'did not start slurm')
         service.check_stop(core.config['slurm.service-name']) # service requires config so we stop it first
-        if core.el_release() >= 7:
-            service.check_stop(core.config['slurm.ctld-service-name'])
+        service.check_stop(core.config['slurm.ctld-service-name'])
         files.restore(core.config['slurm.config'], 'slurm')
         files.restore(core.config['cgroup.config'], 'slurm')
         files.restore(core.config['cgroup_allowed_devices_file.conf'], 'slurm')