Merge pull request #4 from opensciencegrid/master

Have my fork up to date

Author: efajardo

.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
@@ -18,5 +18,5 @@ before_install:
 
 script:
  # Run tests in Container
-- travis-ci/setup_tests.sh ${OS_VERSION} ${PACKAGES}
+- travis-ci/setup_tests.sh
 

Makefile

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

README.md

@@ -36,7 +36,7 @@ All steps are performed as `root`:
 
 1.  Clone the git repository and `cd` into it:
 
-        [root@client ~ ] $ git clone https://github.com/brianhlin/osg-test.git
+        [root@client ~ ] $ git clone https://github.com/opensciencegrid/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.
@@ -55,7 +55,6 @@ Fundamentally, the `osg-test` script runs tests and reports on their results. Ho
 | Option                       | Description                                                                                                                                                                                                                                |
 |------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `-a`, `--add-user`           | Add and configure the test user account (see also `-u` below). By default, the script assumes that the test user account already exists and is configured with a valid X.509 certificate in its `.globus` directory.                       |
-| `--cilogon`                  | Generate CILogon-like certificates                                                                                                                                                                                                         |
 | `-c`, `--config` FILE        | Configuration file to use that specifies command-line options. See below for syntax                                                                                                                                                        |
 | `-d`, `--dump-output`        | After all test output, print all commands and their output from the test run. Typically generates **a lot** of output.                                                                                                                     |
 | `--df`, `--dump-file` FILE   | Like `--dump-output`, but prints the output to a file instead of the console                                                                                                                                                               |
@@ -85,7 +84,6 @@ Unfortunately, the names of the variables in the config file are not the same as
 | Command-Line         | Config File   | Default Value |
 |:---------------------|:--------------|:--------------|
 | --add-user           | adduser       | False         |
-| --cilogon            | cilogon       | True          |
 | --dump-output        | dumpout       | False         |
 | --dump-file          | dumpfile      | None          |
 | --extra-repo         | extrarepos    | []            |
@@ -388,7 +386,7 @@ Before you go and commit your changes, it's a good idea to make sure they don't
     ```
 4.  Run the tests and monitor their output:
     ```
-    [root@client ~]$ osg-test -vad > <OUTFILE>
+    [root@client ~]$ osg-test -vad > <OUTFILE> 2>&1 &
     [root@client ~]$ tail -f <OUTFILE>
     ```
 

bootstrap-osg-test

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+UPSTREAM=https://github.com/opensciencegrid
+
 on_error_die()
 {
     if [ $? -ne 0 ]; then
@@ -11,32 +13,20 @@ on_error_die()
     fi
 }
 
-if [ $# -lt 1 ]; then
+if [ $# -ne 1 ]; then
     echo "Requires the major version number, i.e. 3.2 for 3.2.0"
-    echo "usage: $0 <major version> [testing|development]"
+    echo "usage: $0 <major version>"
     exit 1
 fi
 
 if [[ $1 =~ ^[0-9]+\.[0-9]+$ ]]; then
     version=$1
 else
     echo "Major version should be in the form of '<number>.<number>, i.e. 3.2"
-    echo "usage: $0 <major version> [testing|development]"
+    echo "usage: $0 <major version>"
     exit 1
 fi
 
-extra_repo=
-case $2 in
-    test|testing)     extra_repo='--enablerepo=osg-testing';;
-    dev|development)  extra_repo='--enablerepo=osg-development';;
-    '') ;;
-    *)
-        echo "$0: unknown option '$1'"
-        echo "usage: $0 <major version> [testing|development]"
-        exit 1
-        ;;
-esac
-
 # Determine platform-specific details
 release=`cat /etc/redhat-release`
 case $release in
@@ -79,7 +69,8 @@ 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 https://repo.grid.iu.edu/osg/$version/$osg_name
+    curl --fail --location --output $osg_name --retry 10 --silent \
+         https://repo.opensciencegrid.org/osg/$version/$osg_name
     on_error_die "Could not download $osg_name"
     echo -n 'Installing osg-release... '
     rpm --install --nosignature $osg_name
@@ -99,11 +90,13 @@ 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
-echo -n "Install osg-test... "
-yum -y --quiet $extra_repo install osg-test
-on_error_die "Could not install osg-test"
-echo -n 'Verify osg-test... '
-rpm --verify osg-test
-on_error_die "Could not verify osg-test"
+cd /tmp
+for repo in osg-test osg-ca-generator; do
+    git clone --depth 1 $UPSTREAM/$repo
+    on_error_die "Failed to clone $UPSTREAM/$repo"
+    pushd $repo
+    make install
+    on_error_die "Failed to install $repo"
+    popd
+done
+

files/test_sequence

@@ -1,67 +1,66 @@
-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_13_gridftp
-test_14_lcmaps
-test_15_xrootd
-test_16_rsv
-test_17_pbs
-test_18_cvmfs
-test_19_condorce
-test_20_voms
-test_21_gums
-test_22_myproxy
-test_23_gratia
-test_24_tomcat
-test_25_voms_admin
-test_26_bestman
-test_28_gsiopenssh
-test_29_slurm
-test_30_misc
-test_35_osg_configure
-test_38_cvmfs
-test_40_proxy
-test_41_jobs
-test_42_gridftp
-test_43_uberftp
-test_44_glexec
-test_45_xrootd
-test_47_rsv
-test_48_myproxy
-test_49_jobs
-test_50_voms
-test_51_edgmkgridmap
-test_52_bestman
-test_53_gums
-test_54_gratia
-test_55_condorce
-test_58_gfal2util
-test_59_gsiopenssh
-test_74_slurm
-test_75_gums
-test_76_tomcat
-test_77_myproxy
-test_78_voms
-test_79_condorce
-test_80_gratia
-test_82_cvmfs
-test_83_rsv
-test_84_xrootd
-test_85_lcmaps
-test_86_gridftp
-test_88_condor_cron
-test_89_condor
-test_90_bestman
-test_91_pbs
-test_92_gsiopenssh
-test_94_munge
-test_95_mysqld
-test_96_proxy
-test_97_java
-test_98_haveged
+test_030_haveged
+test_040_java
+test_050_mysqld
+test_060_fetch_crl
+test_070_munge
+test_090_jobs
+test_100_condor
+test_110_condor_cron
+test_130_gridftp
+test_140_lcmaps
+test_150_xrootd
+test_160_rsv
+test_170_pbs
+test_180_cvmfs
+test_190_condorce
+test_200_voms
+test_210_gums
+test_220_myproxy
+test_230_gratia
+test_240_tomcat
+test_250_voms_admin
+test_260_bestman
+test_280_gsiopenssh
+test_290_slurm
+test_300_misc
+test_380_cvmfs
+test_400_proxy
+test_480_myproxy
+test_500_voms
+test_410_jobs
+test_420_gridftp
+test_430_uberftp
+test_440_glexec
+test_450_xrootd
+test_470_rsv
+test_490_jobs
+test_510_edgmkgridmap
+test_520_bestman
+test_530_gums
+test_540_gratia
+test_550_condorce
+test_580_gfal2util
+test_590_gsiopenssh
+test_740_slurm
+test_750_gums
+test_760_tomcat
+test_770_myproxy
+test_780_voms
+test_790_condorce
+test_800_gratia
+test_820_cvmfs
+test_830_rsv
+test_840_xrootd
+test_850_lcmaps
+test_860_gridftp
+test_880_condor_cron
+test_890_condor
+test_900_bestman
+test_910_pbs
+test_920_gsiopenssh
+test_940_munge
+test_950_mysqld
+test_960_proxy
+test_970_java
+test_980_haveged
 

osg-test

@@ -1,5 +1,6 @@
 #!/usr/bin/python
 
+from __future__ import print_function
 from distutils.sysconfig import get_python_lib
 from optparse import OptionParser
 import ConfigParser
@@ -21,7 +22,6 @@ from osgtest.library import osgunittest
 def parse_command_line():
     defaults = {"adduser": False,
                 "backupmysql": False,
-                "cilogon": False,
                 "config": None,
                 "dumpfile": None,
                 "dumpout": False,
@@ -56,7 +56,7 @@ def parse_command_line():
         config_file = ConfigParser.RawConfigParser()
         try:
             config_file.read(opts.config)
-        except ConfigParser.ParsingError, exc:
+        except ConfigParser.ParsingError as exc:
             sys.stderr.write("Error while parsing: %s\n%s\n" % (opts.config, exc))
             sys.stderr.write("Lines with options should not start with a space\n")
             sys.exit(1)
@@ -96,9 +96,6 @@ def read_args():
     p.add_option('-a', '--add-user', action='store_true', dest='adduser',
                  help='Add and configure the test user account (see -u below)')
 
-    p.add_option('--cilogon', action='store_true', dest='cilogon',
-                 help='Generate CILogon-like certificates')
-
     p.add_option('-c', '--config', action='store', type='string', dest='config',
                  help='Configuration file to use that specifies command-line options')
 
@@ -172,7 +169,7 @@ def get_password():
     if core.options.securepass:
         # If the user also specifies password on the command line, we complain
         if core.options.password != 'vdttest':
-            print 'Only specify one of --password and --securepass'
+            print('Only specify one of --password and --securepass')
             sys.exit(1)
         core.options.password = getpass()
 
@@ -256,6 +253,6 @@ if __name__ == '__main__':
         signal.alarm(0)
         signal.signal(signal.SIGALRM, signal.SIG_DFL)
     else:
-        print 'No tests to run.'
+        print('No tests to run.')
     wrap_up()
     sys.exit(EXIT_CODE)