Merge pull request #121 from brianhlin/sw3201_33_el7

Fix gfal dependencies; drop Gratia + osg-configure tests

.travis.yml

@@ -1,10 +1,10 @@
 sudo: required
 env:
   matrix:
-  - OS_TYPE=centos OS_VERSION=6 PACKAGES=osg-ce-condor,vo-client-lcmaps-voms,llrun
-  - OS_TYPE=centos OS_VERSION=6 PACKAGES=osg-gridftp,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun
-  - OS_TYPE=centos OS_VERSION=7 PACKAGES=osg-ce-condor,vo-client-lcmaps-voms,llrun,singularity-runtime,osg-oasis
-  - OS_TYPE=centos OS_VERSION=7 PACKAGES=osg-gridftp,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun,singularity-runtime,osg-oasis
+  - OS_TYPE=centos OS_VERSION=6 PACKAGES=osg-ce-condor,rsv,vo-client-lcmaps-voms,llrun
+  - OS_TYPE=centos OS_VERSION=6 PACKAGES=osg-gridftp,rsv,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun
+  - OS_TYPE=centos OS_VERSION=7 PACKAGES=osg-ce-condor,rsv,vo-client-lcmaps-voms,llrun,singularity-runtime,osg-oasis
+  - OS_TYPE=centos OS_VERSION=7 PACKAGES=osg-gridftp,rsv,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun,singularity-runtime,osg-oasis
 
 services:
   - docker

files/test_sequence

@@ -23,7 +23,6 @@ test_26_bestman
 test_28_gsiopenssh
 test_29_slurm
 test_30_misc
-test_35_osg_configure
 test_38_cvmfs
 test_40_proxy
 test_48_myproxy

osgtest/tests/test_23_gratia.py

@@ -8,6 +8,9 @@
 
 class TestStartGratia(osgunittest.OSGTestCase):
 
+    def setUp(self):
+        self.skip_ok_if(core.el_release() > 6, "Do not run Gratia tests on EL7")
+
     def patternreplace(self, infile_name, pattern, full_line):
         """This helper method loops through the passed in infile line by line.
      If it finds the passed in pattern, it replaces the whole line with

osgtest/tests/test_26_bestman.py

@@ -16,15 +16,15 @@ def test_01_config_certs(self):
 
     @osgrelease(3.3)
     def test_02_install_bestman_certs(self):
-        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client')
+        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client', 'gums-service')
         if os.path.exists(core.config['certs.bestmancert']) and os.path.exists(core.config['certs.bestmankey']):
             return
         core.install_cert('certs.bestmancert', 'certs.hostcert', 'bestman', 0644)
         core.install_cert('certs.bestmankey', 'certs.hostkey', 'bestman', 0400)
 
     @osgrelease(3.3)
     def test_03_modify_sudoers(self):
-        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client')
+        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client', 'gums-service')
         sudoers_path = '/etc/sudoers'
         contents = files.read(sudoers_path)
         srm_cmd = 'Cmnd_Alias SRM_CMD = /bin/rm, /bin/mkdir, /bin/rmdir, /bin/mv, /bin/cp, /bin/ls'
@@ -55,7 +55,7 @@ def test_03_modify_sudoers(self):
 
     @osgrelease(3.3)
     def test_04_modify_bestman_conf(self):
-        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client')
+        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client', 'gums-service')
 
         bestman_rc_path = '/etc/bestman2/conf/bestman2.rc'
         old_port = 'securePort=8443'
@@ -83,7 +83,7 @@ def test_05_start_bestman(self):
         core.state['bestman.started-server'] = False
         core.state['bestman.server-running'] = False
 
-        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client')
+        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client', 'gums-service')
         if service.is_running('bestman2'):
             core.state['bestman.server-running'] = True
             self.skip_ok('bestman2 already running')

osgtest/tests/test_54_gratia.py

@@ -7,6 +7,9 @@
 
 class TestGratia(osgunittest.OSGTestCase):
 
+    def setUp(self):
+        self.skip_ok_if(core.el_release() > 6, "Do not run Gratia tests on EL7")
+
     def patternreplace(self, infile_name, pattern, full_line, insert_after=False):
         """This method is taken from test_28 - we can consider moving it to core.py module
      This helper method loops through the passed in infile line by line.

osgtest/tests/test_58_gfal2util.py

@@ -38,7 +38,7 @@ def setup_temp_paths(self):
 
     @core.osgrelease(3.3)
     def test_01_copy_local_to_server_gfal2_util(self):
-        core.skip_ok_unless_installed('bestman2-server', 'gfal2-plugin-srm')
+        core.skip_ok_unless_installed('bestman2-server', 'gfal2-plugin-srm', 'gums-service')
         self.skip_bad_unless(core.state['bestman.server-running'], 'bestman server not running')
         self.setup_temp_paths()
         os.chmod(TestGFAL2Util.__temp_dir, 0777)
@@ -51,7 +51,7 @@ def test_01_copy_local_to_server_gfal2_util(self):
 
     @core.osgrelease(3.3)
     def test_02_copy_server_to_local_gfal2_util(self):
-        core.skip_ok_unless_installed('bestman2-server',  'gfal2-plugin-srm')
+        core.skip_ok_unless_installed('bestman2-server',  'gfal2-plugin-srm', 'gums-service')
         self.skip_bad_unless(core.state['bestman.server-running'], 'bestman server not running')
         command = ('gfal-copy', '-v', self.get_srm_url(), 'file://' + TestGFAL2Util.__local_path)
         status, stdout, stderr = core.system(command, True)
@@ -63,7 +63,7 @@ def test_02_copy_server_to_local_gfal2_util(self):
 
     @core.osgrelease(3.3)
     def test_03_remove_server_file_gfal2_util(self):
-        core.skip_ok_unless_installed('bestman2-server',  'gfal2-plugin-srm')
+        core.skip_ok_unless_installed('bestman2-server',  'gfal2-plugin-srm', 'gums-service')
         self.skip_bad_unless(core.state['bestman.server-running'], 'bestman server not running')
         command = ('gfal-rm', '-v', self.get_srm_url())
         status, stdout, stderr = core.system(command, True)

osgtest/tests/test_80_gratia.py

@@ -7,6 +7,9 @@
 
 class TestStopGratia(osgunittest.OSGTestCase):
 
+    def setUp(self):
+        self.skip_ok_if(core.el_release() > 6, "Do not run Gratia tests on EL7")
+
     #This test removes the http certificates, if not already removed earlier
     def test_01_remove_certs(self):
 

osgtest/tests/test_90_bestman.py

@@ -9,12 +9,12 @@ class TestStopBestman(osgunittest.OSGTestCase):
 
     @osgrelease(3.3)
     def test_01_stop_bestman(self):
-        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client')
+        core.skip_ok_unless_installed('bestman2-server', 'bestman2-client', 'gums-service')
         self.skip_ok_unless(core.state['bestman.started-server'], 'bestman server not started')
         service.check_stop('bestman2')
 
     @osgrelease(3.3)
     def test_02_deconfig_sudoers(self):
-        if core.missing_rpm('bestman2-server', 'bestman2-client'):
+        if core.missing_rpm('bestman2-server', 'bestman2-client', 'gums-service'):
             return
         files.restore('/etc/sudoers', 'bestman')