summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2014-03-07 11:39:11 +0000
committervarac <varacanero@zeromail.org>2014-03-07 11:39:11 +0000
commit4d007ed1df85e46182b186059fe325c05aaff7c2 (patch)
tree1796adbc379f56b57e7e2bf576fa737bb2946b6a
parent13f49104b98c284224ccc01965ba64eac97ee4cb (diff)
Platform Ci testing script doesn't report failures (Feature #5263), updated filters
-rwxr-xr-xleap-platform-test9
1 files changed, 6 insertions, 3 deletions
diff --git a/leap-platform-test b/leap-platform-test
index cba10fc..c6b3439 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -96,17 +96,18 @@ deploy() {
# we need to deploy with verbose level 2, and filter out unwanted stuff
# until puppet errors show up in verbose level 0 +1 (#1750)
- FILTER_CLI='= read|= loading|= no change| - executing| = executing| = applying| = ran git| = checking| = synching| = skipping file_path| - cd .*; rsync -| - hiera| = created hiera/| = updated hiera/| - cd /root/| - rolling backexecuting| - files/|\[bin,puppet\] ->|] Hostname updated.| = Updating submodule puppet/modules|Warning: Permanently added.*to the list of known hosts.| = leap command v| = leap platform v| - \[.*\] ok'
+ FILTER_CLI='= read|= loading|= no change| - executing| = executing| = applying| = ran git| = checking| = synching| = skipping file_path| - cd .*; rsync -| - hiera| = created hiera/| = updated hiera/| - cd /root/| - rolling backexecuting| - files/|\[bin,tests,puppet\] ->|] Hostname updated.| = Updating submodule puppet/modules|Warning: Permanently added.*to the list of known hosts.| = leap command v| = leap platform v| - \[.*\] ok'
- FILTER_PUPPET='] notice: |] No change to hostname|] Puppet apply complete|] warning: Dynamic lookup|] warning: Scope\(Class|Skipping because of failed dependencies'
+ FILTER_PUPPET='] notice: |] No change to hostname|] Puppet apply complete \(changes made\).|] warning: Dynamic lookup|] warning: Scope\(Class|Skipping because of failed dependencies'
- if [ -n $FILTER_PUPPET ]
+ if [ -n "$FILTER_COMMON" ]
then
FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_COMMON)"
else
FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET)"
fi
+
for vm in $@
do
[ -e $LOGDIR ] || mkdir -p $LOGDIR
@@ -260,6 +261,8 @@ versions () {
}
+# http://docs.vagrantup.com/v2/providers/default.html
+export VAGRANT_DEFAULT_PROVIDER="libvirt"