Use pre-defined package lists in Travis-CI

Populated from the 3.5 vm-test-run parameters

Author: brianhlin

.travis.yml

@@ -5,14 +5,18 @@ git:
   quiet: true
 
 env:
-  - OSG_RELEASE=3.4 OS_VERSION=6 PACKAGES=osg-ce-condor,rsv,vo-client-lcmaps-voms,llrun
-  - OSG_RELEASE=3.4 OS_VERSION=6 PACKAGES=osg-gridftp,rsv,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun
-  - OSG_RELEASE=3.4 OS_VERSION=7 PACKAGES=osg-ce-condor,rsv,vo-client-lcmaps-voms,llrun,singularity,osg-oasis
-  - OSG_RELEASE=3.4 OS_VERSION=7 PACKAGES=osg-gridftp,rsv,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun,singularity,osg-oasis
-  - OSG_RELEASE=3.4 OS_VERSION=7 PACKAGES=xrootd,xrootd-client,xrootd-multiuser,globus-proxy-utils
-  - OSG_RELEASE=3.5 OS_VERSION=7 PACKAGES=osg-ce-condor,vo-client-lcmaps-voms,llrun,singularity,osg-oasis
-  - OSG_RELEASE=3.5 OS_VERSION=7 PACKAGES=osg-gridftp,lcmaps,lcmaps-db-templates,vo-client-lcmaps-voms,rsv,llrun,singularity,osg-oasis
-  - OSG_RELEASE=3.5 OS_VERSION=7 PACKAGES=xrootd,xrootd-client,xrootd-multiuser,globus-proxy-utils
+  - OSG_RELEASE=3.4 OS_VERSION=6 PKG_SET=htcondor-ce
+  - OSG_RELEASE=3.4 OS_VERSION=6 PKG_SET=gridftp
+  - OSG_RELEASE=3.4 OS_VERSION=7 PKG_SET=htcondor-ce
+  - OSG_RELEASE=3.4 OS_VERSION=7 PKG_SET=gridftp
+  - OSG_RELEASE=3.4 OS_VERSION=7 PKG_SET=singularity
+  - OSG_RELEASE=3.4 OS_VERSION=7 PKG_SET=stashcache
+  - OSG_RELEASE=3.4 OS_VERSION=7 PKG_SET=xrootd
+  - OSG_RELEASE=3.5 OS_VERSION=7 PKG_SET=htcondor-ce
+  - OSG_RELEASE=3.5 OS_VERSION=7 PKG_SET=gridftp
+  - OSG_RELEASE=3.5 OS_VERSION=7 PKG_SET=singularity
+  - OSG_RELEASE=3.5 OS_VERSION=7 PKG_SET=stashcache
+  - OSG_RELEASE=3.5 OS_VERSION=7 PKG_SET=xrootd
 
 services:
   - docker

travis-ci/gridftp.packages

@@ -0,0 +1,2 @@
+osg-gridftp
+osg-gridftp-xrootd

travis-ci/htcondor-ce.packages

@@ -0,0 +1,2 @@
+osg-ce-condor
+globus-proxy-utils

travis-ci/setup_tests.sh

@@ -6,7 +6,7 @@
 # We use `--privileged` for cgroup compatability, which seems to be enabled by default in HTCondor 8.6.x
 
 ENV_FILE=/tmp/travis.env
-for vars in {OSG_RELEASE,OS_VERSION,PACKAGES}; do
+for vars in {OSG_RELEASE,OS_VERSION,PKG_SET}; do
     echo "$vars=${!vars}" >> $ENV_FILE
 done
 

travis-ci/singularity.packages

@@ -0,0 +1,2 @@
+osg-oasis
+singularity

travis-ci/stashcache.packages

@@ -0,0 +1,3 @@
+stashcache-client
+stash-cache
+stash-origin

travis-ci/test_inside_docker.sh

@@ -63,7 +63,12 @@ cp /etc/condor/config.d/99-local.conf /etc/condor-ce/config.d/99-local.conf
 export _condor_CONDOR_CE_TRACE_ATTEMPTS=60
 
 # Ok, do actual testing
-INSTALL_STR="--install ${PACKAGES//,/ --install }"
+
+install_str=''
+while read package; do
+    install_str="$install_str --install $package"
+done < /osg-test/travis-ci/"$PKG_SET".packages
+
 echo "------------ OSG Test --------------"
 
 osg-test --verbose \
@@ -72,4 +77,4 @@ osg-test --verbose \
          --hostcert \
          --no-cleanup \
          ${extra_repos} \
-         ${INSTALL_STR}
+         ${install_str}

travis-ci/xrootd.packages

@@ -0,0 +1,10 @@
+xrootd
+xrootd-multiuser
+xrootd-lcmaps
+xrootd-client
+xrootd-fuse
+xrootd-scitokens
+lcmaps-db-templates
+vo-client-lcmaps-voms
+globus-proxy-utils
+osg-gridftp-xrootd