Removed the el6 special stuff

Author: efajardo

.travis.yml

@@ -1,7 +1,7 @@
 sudo: required
 env:
   matrix:
-  - OS_TYPE=centos OS_VERSION=6 PACKAGES=osg-ce-condor,vo-client-lcmaps-voms,llrun,osg-oasis
+  - 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

osgtest/tests/test_38_cvmfs.py

@@ -10,13 +10,6 @@ class TestCvmfs(osgunittest.OSGTestCase):
     __cvmfs_image = '/cvmfs/singularity.opensciencegrid.org/opensciencegrid/osg-wn:3.3-el6'
     core.config['cvmfs.debug-dirs'] = []
 
-    def mountSingularityCVMFSRepo(self, repo):
-        command = ('mkdir', '-p', '/cvmfs/' + repo)
-        core.check_system(command, 'Manually creating cvmfs dir')
-
-        command = ('mount', '-t', 'cvmfs', 'repo', '/cvmfs/' + repo)
-        core.check_system(command, 'Manually mounting cvmfs singularity repo')
-
     def debug_cvmfs(self, repo):
         temp_dir = tempfile.mkdtemp()
         core.config['cvmfs.debug-dirs'].append(temp_dir)
@@ -111,8 +104,7 @@ def test_04_singularity(self):
         core.skip_ok_unless_installed('cvmfs')
         core.skip_ok_unless_installed('cvmfs-keys', by_dependency=True)
         singularity_repo = 'singularity.opensciencegrid.org'
-        if core.el_release() <= 6:
-             self.mountSingularityCVMFSRepo(singularity_repo)
+
         command = ('ls', '/cvmfs/' + singularity_repo)
         core.check_system(command, "testing cvmfs access to singularity repo")