Merge pull request #124 from sthapa/master

osg-test changes for SOFTWARE-3202

Author: brianhlin

osgtest/library/core.py

@@ -57,10 +57,10 @@ def handler(*args, **kwargs):
 _el_release = None
 
 SLURM_PACKAGES = ['slurm',
-                  'slurm-munge',
+                  'slurm-slurmd',
+                  'slurm-slurmctld',
                   'slurm-perlapi',
-                  'slurm-plugins',
-                  'slurm-sql']
+                  'slurm-slurmdbd']
 
 # ------------------------------------------------------------------------------
 # Global Functions

osgtest/tests/test_29_slurm.py

@@ -4,8 +4,11 @@
 import osgtest.library.osgunittest as osgunittest
 import osgtest.library.service as service
 
+import time
+
 CLUSTER_NAME = 'osg_test'
 CTLD_LOG = '/var/log/slurm/slurmctld.log'
+SLURM_LOG = '/var/log/slurm/slurm.log'
 SHORT_HOSTNAME = core.get_hostname().split('.')[0]
 
 SLURMDBD_CONFIG = """AuthType=auth/munge
@@ -39,6 +42,21 @@
 StateSaveLocation=/var/spool/slurmd
 """
 
+SLURM_CGROUPS_CONFIG = """CgroupAutomount=yes
+CgroupMountpoint=/cgroup
+ConstrainCores=no
+ConstrainRAMSpace=no
+"""
+
+SLURM_CGROUPS_DEVICE_CONFIG = """/dev/null
+/dev/urandom
+/dev/zero
+/dev/sda*
+/dev/cpu/*/*
+/dev/pts/*
+"""
+
+
 class TestStartSlurm(osgunittest.OSGTestCase):
 
     def slurm_reqs(self):
@@ -52,6 +70,20 @@ def test_01_slurm_config(self):
                     SLURM_CONFIG % {'short_hostname': SHORT_HOSTNAME, 'cluster': CLUSTER_NAME, 'ctld_log': CTLD_LOG},
                     owner='slurm',
                     chmod=0644)
+        core.config['cgroup.config'] = '/etc/slurm/cgroup.conf'
+        config = SLURM_CGROUPS_CONFIG
+        if core.el_release() == 6:
+            config += "\nCgroupMountpoint=/cgroup"
+        files.write(core.config['cgroup.config'],
+                    config,
+                    owner='slurm',
+                    chmod=0644)
+
+        core.config['cgroup_allowed_devices_file.conf'] = '/etc/slurm/cgroup_allowed_devices_file.conf'
+        files.write(core.config['cgroup_allowed_devices_file.conf'],
+                    SLURM_CGROUPS_DEVICE_CONFIG,
+                    owner='slurm',
+                    chmod=0644)
 
     def test_02_start_slurmdbd(self):
         core.state['slurmdbd.started-service'] = False
@@ -88,20 +120,31 @@ 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.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)
 
-        command = ['slurmctld']
-        core.check_system(command, 'enable slurmctld')
-        service.check_start(core.config['slurm.service-name'])
+        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'])
 
         core.monitor_file(CTLD_LOG,
                           stat,
                           'slurm_rpc_node_registration complete for %s' % SHORT_HOSTNAME,
                           60.0)
+        log_stat = core.get_stat(SLURM_LOG)
+        core.monitor_file(SLURM_LOG,
+                          log_stat,
+                          'slurmd started',
+                          60.0)
         command = ['scontrol', 'update', 'nodename=%s' % SHORT_HOSTNAME, 'state=idle']
         core.check_system(command, 'enable slurm node')
 

osgtest/tests/test_74_slurm.py

@@ -13,7 +13,11 @@ 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'])
         files.restore(core.config['slurm.config'], 'slurm')
+        files.restore(core.config['cgroup.config'], 'slurm')
+        files.restore(core.config['cgroup_allowed_devices_file.conf'], 'slurm')
 
     def test_02_stop_slurmdbd(self):
         self.slurm_reqs()