Move bleadperl to 'fail ok' submatrix - too much churn

diff --git a/.travis.yml b/.travis.yml
index 9abef31..1438706 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -69,13 +69,6 @@ env:
 
 matrix:
   include:
-    # bleadperl
-    - perl: bleadperl_thr_mb
-      env:
-        - CLEANTEST=false
-        - BREWOPTS="-Duseithreads -Dusemorebits"
-        - BREWVER=blead
-
     # minimum supported with threads
     - perl: 5.8.5_thr
       env:
@@ -133,6 +126,22 @@ matrix:
         - DBIC_TRACE=1
         - DBIC_TRACE_PROFILE=console_monochrome
 
+    ###
+    # Start of the allow_failures block
+
+    # bleadperl
+    - perl: bleadperl_thr_mb
+      env:
+        - CLEANTEST=false
+        - BREWOPTS="-Duseithreads -Dusemorebits"
+        - BREWVER=blead
+
+
+  # which ones of the above can fail
+  allow_failures:
+    - perl: bleadperl_thr_mb
+
+
 # sourcing the files is *EXTREMELY* important - otherwise
 # no envvars will survive
 

diff --git a/maint/travis-ci_scripts/10_before_install.bash b/maint/travis-ci_scripts/10_before_install.bash
index 7b6d98b..12a6189 100755 (executable)
--- a/maint/travis-ci_scripts/10_before_install.bash
+++ b/maint/travis-ci_scripts/10_before_install.bash
@@ -3,16 +3,6 @@
 source maint/travis-ci_scripts/common.bash
 if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
 
-# do some extra short-circuiting here
-
-# when smoking master do not attempt bleadperl (not release-critical)
-if [[ "$TRAVIS_BRANCH" = "master" ]] && [[ "$BREWVER" = "blead" ]]; then
-  echo_err "$(tstamp) master branch is not smoked with bleadperl - bailing out"
-  export SHORT_CIRCUIT_SMOKE=1
-fi
-
-if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
-
 # Different boxes we run on may have different amount of hw threads
 # Hence why we need to query
 # Originally we used to read /sys/devices/system/cpu/online