Merge pull request #3 from opensciencegrid/master

My fork up to date

Author: efajardo

Makefile

@@ -6,7 +6,7 @@
 # ------------------------------------------------------------------------------
 
 PACKAGE := osg-test
-VERSION := 1.11.2
+VERSION := 2.0.0
 
 
 # ------------------------------------------------------------------------------

README.md

@@ -39,16 +39,16 @@ All steps are performed as `root`:
         [root@client ~ ] $ git clone https://github.com/brianhlin/osg-test.git
         [root@client ~ ] $ cd osg-test
 
-2.  Bootstrap the test system using the `osg-testing` yum repository. The `osg release` is required as the first argument and takes the form of '<major version>.<minor version>' e.g. `3.2`. To get `osg-test` from the `osg-development` Yum repository, replace the second argument with `development`; to get `osg-test` from the production repository, omit the second argument. This step makes sure that both the EPEL and OSG repositories are available, then installs and verifies the `osg-test` package itself.
+2.  Bootstrap the test system using the `osg-testing` yum repository. The `osg release` is required as the first argument and takes the form of `<major version>.<minor version>` e.g. `3.2`. To get `osg-test` from the `osg-development` Yum repository, replace the second argument with `development`; to get `osg-test` from the production repository, omit the second argument. This step makes sure that both the EPEL and OSG repositories are available, then installs and verifies the `osg-test` package itself.
 
         [root@client ~] $ ./bootstrap-osg-test <osg release> testing
 
-3.  Run the tests (see below for options). Be sure to direct the stdout/stderr to a file to get all the information from the test run (the dump-file option only outputs some of the output to a file): 
+3.  Run the tests (see below for options). Be sure to direct the stdout/stderr to a file to get all the information from the test run (the dump-file option only outputs some of the output to a file):
 
         [root@client ~] $ osg-test -vadi <PACKAGE> -r osg-testing > <output file> 2>&1
 
-`osg-test` Usage
-----------------
+osg-test Script Usage
+---------------------
 
 Fundamentally, the `osg-test` script runs tests and reports on their results. However, the script can also perform many of the housekeeping tasks associated with setting up and tearing down the test environment, including adding (and later removing) a test user and its X.509 certificate, installing (and later removing) one or more RPMs, and so on. The following options are available:
 

bootstrap-osg-test

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# The way in which we download and/or install the YUM repository RPMs is unsafe,
-# because it assumes specific versions at specific URLs.  Ideally, we would have
-# a way to discover the latest versions and grab them.
-
 on_error_die()
 {
     if [ $? -ne 0 ]; then
@@ -45,13 +41,11 @@ esac
 release=`cat /etc/redhat-release`
 case $release in
     *6.* )
-        rpm_name='epel-release-6-8.noarch.rpm'
-        rpm_path='http://download.fedoraproject.org/pub/epel/6/i386/epel-release-6-8.noarch.rpm'
+        rpm_name='epel-release-latest-6.noarch.rpm'
         osg_name="osg-$version-el6-release-latest.rpm"
         ;;
     *7.* )
-        rpm_name='epel-release-7-5.noarch.rpm'
-        rpm_path='https://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm'
+        rpm_name='epel-release-latest-7.noarch.rpm'
         osg_name="osg-$version-el7-release-latest.rpm"
         ;;
     * )
@@ -60,6 +54,7 @@ case $release in
         ;;
 esac
 
+rpm_path="https://dl.fedoraproject.org/pub/epel/$rpm_name"
 epel_rpm=`rpm -q epel-release 2>/dev/null`
 if [ $? -eq 1 ]; then
     echo -n "Downloading $rpm_name... "
@@ -84,7 +79,7 @@ on_error_die "Could not enable epel"
 osg_rpm=`rpm -q osg-release 2>/dev/null`
 if [ $? -eq 1 ]; then
     echo -n "Downloading $osg_name... "
-    curl --fail --location --output $osg_name --retry 10 --silent http://repo.grid.iu.edu/osg/$version/$osg_name
+    curl --fail --location --output $osg_name --retry 10 --silent https://repo.grid.iu.edu/osg/$version/$osg_name
     on_error_die "Could not download $osg_name"
     echo -n 'Installing osg-release... '
     rpm --install --nosignature $osg_name
@@ -97,12 +92,12 @@ echo -n 'Updating osg-release... '
 yum -y --quiet update osg-release
 on_error_die 'Could not update osg-release'
 
-echo -n "Install yum-priorities... "
-yum -y --quiet install yum-priorities
-on_error_die "Could not install yum-priorities"
-echo -n 'Verify yum-priorities... '
-rpm --verify yum-priorities || rpm --verify yum-plugin-priorities
-on_error_die "Could not verify yum-priorities or yum-plugin-priorities"
+echo -n "Install yum-plugin-priorities... "
+yum -y --quiet install yum-plugin-priorities
+on_error_die "Could not install yum-plugin-priorities"
+echo -n 'Verify yum-plugin-priorities... '
+rpm --verify yum-plugin-priorities
+on_error_die "Could not verify yum-plugin-priorities"
 
 # Always erase and install, to get latest
 rpm -e osg-test >/dev/null 2>&1

files/test_sequence

@@ -1,11 +1,11 @@
+test_03_haveged
 test_04_java
 test_05_mysqld
 test_06_fetch_crl
 test_07_munge
 test_09_jobs
 test_10_condor
 test_11_condor_cron
-test_12_gatekeeper
 test_13_gridftp
 test_14_lcmaps
 test_15_xrootd
@@ -37,10 +37,10 @@ test_49_jobs
 test_50_voms
 test_51_edgmkgridmap
 test_52_bestman
-test_58_gfal2util
 test_53_gums
 test_54_gratia
 test_55_condorce
+test_58_gfal2util
 test_59_gsiopenssh
 test_74_slurm
 test_75_gums
@@ -54,7 +54,6 @@ test_83_rsv
 test_84_xrootd
 test_85_lcmaps
 test_86_gridftp
-test_87_gatekeeper
 test_88_condor_cron
 test_89_condor
 test_90_bestman
@@ -64,3 +63,5 @@ test_94_munge
 test_95_mysqld
 test_96_proxy
 test_97_java
+test_98_haveged
+

osgtest/library/condor.py

@@ -2,23 +2,6 @@
 
 import osgtest.library.core as core
 
-def lockfile_path():
-    """The path to the condor lockfile (EL5 and EL6 only)
-    Returns None on EL7.
-
-    """
-    if core.el_release() >= 7:
-        return None
-
-    condor_lockfile = '/var/lock/subsys/condor_master'
-    # The name of the lockfile changed in 7.8.8
-    if core.rpm_is_installed('condor'):
-        condor_version = core.get_package_envra('condor')[2]
-        condor_version_split = condor_version.split('.')
-        if condor_version_split >= ['7', '8', '8']:
-            condor_lockfile = '/var/lock/subsys/condor'
-    return condor_lockfile
-
 def wait_for_daemon(collector_log_path, stat, daemon, timeout):
     """Wait until the requested 'daemon' is available and accepting commands by
     monitoring the specified CollectorLog from the position specified by 'stat'

osgtest/library/core.py

@@ -311,7 +311,7 @@ def missing_rpm(*packages):
 
     If any package is missing, list all missing packages in a skip() message.
     """
-    if isinstance(packages[0], list) or isinstance(packages[0], tuple):
+    if isinstance(packages[0], (list, tuple)):
         packages = packages[0]
 
     missing = []
@@ -346,7 +346,7 @@ def skip_ok_unless_installed(*packages_or_dependencies, **kwargs):
         raise TypeError("skip_ok_unless_installed() got unexpected keyword argument(s) '%s'" %
                         ("', '".join(kwargs.keys())))
 
-    if isinstance(packages_or_dependencies[0], list) or isinstance(packages_or_dependencies[0], tuple):
+    if isinstance(packages_or_dependencies[0], (list, tuple)):
         packages_or_dependencies = packages_or_dependencies[0]
 
     missing = []
@@ -383,8 +383,8 @@ def skip_ok_unless_one_installed(*packages):
      Raise osgunittest.SkipOkException if at least one of the packages are installed                                                           
      otherwise return None.                                                                                                                    
     """
-    if isinstance(packages[0], list) or isinstance(packages[0], tuple):
-                packages = packages[0]
+    if isinstance(packages[0], (list, tuple)):
+        packages = packages[0]
     installed = []
     for package in packages:
         if rpm_is_installed(package):
@@ -406,14 +406,7 @@ def get_package_envra(package_name):
         raise OSError(status, stdout)
 
     envra = stdout.strip().split(' ')
-    # On EL5 machines, both i386 and x86_64 versions of packages get installed, causing this function to always fail
-    if (len(envra) == 10 and
-        envra[0] == envra[5] and
-        envra[1] == envra[6] and
-        envra[2] == envra[7] and
-        envra[3] == envra[8]):
-            envra = envra[0:5]
-    elif len(envra) != 5:
+    if len(envra) != 5:
         raise OSError(status, stdout)
     (epoch, name, version, release, arch) = envra
     # Missing epoch is displayed as '(none)' but treated by rpm as '0'
@@ -506,7 +499,7 @@ def __run_command(command, use_test_user, a_input, a_stdout, a_stderr, log_outpu
     if shell:
         if not isinstance(command, str):
             command = ' '.join(command)
-    elif not (isinstance(command, list) or isinstance(command, tuple)):
+    elif not isinstance(command, (list, tuple)):
         try:
             repr(command)
         except TypeError:
@@ -606,8 +599,8 @@ def wait_for_file(filename, timeout):
 
 def el_release():
     """Return the major version of the Enterprise Linux release the system is
-    running. SL/RHEL/CentOS 5.x will return 5; SL/RHEL/CentOS 6.x will return
-    6.
+    running. SL/RHEL/CentOS 6.x will return 6; SL/RHEL/CentOS 7.x will return
+    7.
 
     """
     global _el_release

osgtest/library/files.py

@@ -104,7 +104,7 @@ def write(path, contents, owner=None, backup=True, chown=(0,0), chmod=0600):
     temp_fd, temp_path = tempfile.mkstemp(prefix=os.path.basename(path) + '.', suffix='.osgtest-new',
                                           dir=os.path.dirname(path))
     temp_file = os.fdopen(temp_fd, 'w')
-    if isinstance(contents, list) or isinstance(contents, tuple):
+    if isinstance(contents, (list, tuple)):
         temp_file.writelines(contents)
     else:
         temp_file.write(contents)

osgtest/library/tomcat.py

@@ -2,20 +2,12 @@
 
 import osgtest.library.core as core
 
-def majorver():
-    "Tomcat major version"
-    if core.el_release() == 7:
-        return 7
-    if core.el_release() == 6:
-        return 6
-    else:
-        return 5
-
 def pkgname():
     "Name of the Tomcat package"
-    if majorver() <= 6:
-        return "tomcat" + str(majorver())
-    return "tomcat"
+    if core.el_release() == 6:
+        return "tomcat6"
+    else:
+        return "tomcat"
 
 def datadir():
     "Path of data directory of Tomcat"
@@ -39,7 +31,7 @@ def contextfile():
 
 def catalinafile():
     "Path of Catalina log file that contains the startup sentinel"
-    if majorver() <= 6:
+    if pkgname() == "tomcat6":
         return os.path.join(logdir(), 'catalina.out')
     else:
         return os.path.join(logdir(), 'catalina.log')
@@ -50,8 +42,5 @@ def pidfile():
 
 def serverlibdir():
     "Path of the server libraries dir of Tomcat"
-    if majorver() >= 6:
-        return os.path.join(datadir(), "lib")
-    else:
-        return os.path.join(datadir(), "server/lib")
+    return os.path.join(datadir(), "lib")
 

osgtest/library/voms.py

@@ -148,6 +148,7 @@ def is_installed():
         if not core.dependency_is_installed(dep):
             return False
 
+    # TODO: drop this check when 3.3 is completely EOL
     if core.el_release() >= 7:
         epoch, _, version, release, _ = core.get_package_envra('voms-server')
         if core.version_compare((epoch, version, release), '2.0.12-3.2') < 0:

osgtest/library/yum.py

@@ -15,9 +15,7 @@ def clean(*repos):
     if not repos: # clean all repos if none specified
         repos = ['*']
 
-    for subcmd in ('all', 'expire-cache'):
-        cmd = ['yum'] + ['--enablerepo=' + x for x in repos] + ['clean', subcmd]
-        core.system(cmd)
+    core.system(['yum'] + ['--enablerepo=' + x for x in repos] + ['clean', 'all'])
 
 
 def retry_command(command, timeout_seconds=3600):