Permalink
Browse files

Smoke all branches on travis except for blocked* and wip/*

  • Loading branch information...
ribasushi committed Mar 1, 2013
1 parent 435f9f8 commit a0acdea013d61412a9aef0f567e036902de4de67
Showing with 6 additions and 11 deletions.
  1. +6 −10 .travis.yml
  2. +0 −1 maint/travis-ci_scripts/10_before_install.bash
View
@@ -30,19 +30,15 @@
#
#
-# Smoke only specific branches to a) not overload the queue and b) not
-# overspam the notification channels
+# Smoke all branches except for blocked* and wip/*
#
-# Furthermore if the branch is ^topic/ - the custom compiled smokes will
-# not run at all, again in order to conserve queue resources
-#
-# Additionally bleadperl tests do not run on master (but do run on smoke/*)
+# Additionally master does not smoke with bleadperl
+# ( implemented in maint/travis-ci_scripts/10_before_install.bash )
#
branches:
- only:
- - master
- - /^smoke\//
- - /^topic\//
+ except:
+ - /^wip\//
+ - /^blocked/
notifications:
irc:
@@ -3,7 +3,6 @@
source maint/travis-ci_scripts/common.bash
if [[ -n "$SHORT_CIRCUIT_SMOKE" ]] ; then return ; fi
-# .travis.yml already restricts branches to master, topic/* and smoke/*
# do some extra short-circuiting here
# when smoking master do not attempt bleadperl (not release-critical)

0 comments on commit a0acdea

Please sign in to comment.