From: Peter Rabbitson <ribasushi@cpan.org>
Date: Fri, 3 Apr 2015 13:06:04 +0000 (+0200)
Subject: (travis) More robust post-success test cycle run (enhancements over bf44bdb9)
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=baa02fa95f293fa55614707df3720ee820b95d62;p=dbsrgits%2FDBIx-Class-Historic.git

(travis) More robust post-success test cycle run (enhancements over bf44bdb9)

 - Make sure it always runs in parallel
 - Make sure we do not drag in SQLT/Moose after sitelib purge
---

diff --git a/maint/travis-ci_scripts/50_after_success.bash b/maint/travis-ci_scripts/50_after_success.bash
index 4a24b2f..69feec2 100755
--- a/maint/travis-ci_scripts/50_after_success.bash
+++ b/maint/travis-ci_scripts/50_after_success.bash
@@ -7,9 +7,13 @@ if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] || [[ "$TRAVIS_PULL_REQUEST" != "false" ]] ;
 
 # this part needs to run in parallel unconditionally
 export VCPU_USE="$VCPU_AVAILABLE"
+export HARNESS_OPTIONS="j$VCPU_USE"
 
 
 if [[ "$DEVREL_DEPS" == "true" ]] && perl -M5.008003 -e1 &>/dev/null ; then
+  # FIXME - these really need to be installed *with* testing under "allowed failures"
+  # Change when Moose goes away
+  parallel_installdeps_notest Moose
   parallel_installdeps_notest $(perl -Ilib -MDBIx::Class::Optional::Dependencies=-list_missing,dist_dir)
 
   run_or_err "Attempt to build a dist" "rm -rf inc/ && perl Makefile.PL --skip-author-deps && make dist"
@@ -33,6 +37,14 @@ if [[ -n "$tarball_assembled" ]] ; then
   # kill as much as possible with fire
   purge_sitelib
 
+
+  # undo some of the pollution (if any) affecting the plain install deps
+  # FIXME - this will go away once we move off Moose, and a new SQLT
+  # with much less recommends ships
+  export DBICTEST_SQLT_DEPLOY=""
+  export DBICTEST_VIA_REPLICATED=""
+
+
   # make sure we are retrying with newest CPAN possible
   #
   # not running tests on CPAN.pm - they are not terribly slow,
@@ -56,6 +68,8 @@ if [[ -n "$tarball_assembled" ]] ; then
 
   cd "$(find DBIx-Class-* -maxdepth 0 -type d | head -n 1)"
 
+  # only run a full test cycle on devrel_deps, as they are all marked
+  # as "allow fails" in the travis matrix
   if [[ "$DEVREL_DEPS" == "true" ]] ; then
 
     for e in $( env | grep 'DBICTEST.*DSN' | cut -f 1 -d '=' ) ; do