summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2015-09-13 18:54:04 +0200
committervarac <varacanero@zeromail.org>2015-09-13 18:54:04 +0200
commitb6da29b83b6b3d3a572b13b6744b6bbe9b05b8c5 (patch)
tree5d604cfa5501ba8320894d49178a01ec39d1f8d5
parentc4ea59a6dca0d2fcbc69ce5286162d81b2073778 (diff)
parent8178328f7ae0a48a570859816781756ef426b0b6 (diff)
Merge branch 'master' of ssh://greyhound.leap.se:4422/usr/local/bin/platform_test
-rwxr-xr-xleap-platform-test4
1 files changed, 2 insertions, 2 deletions
diff --git a/leap-platform-test b/leap-platform-test
index f5b3405..3f0278f 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -148,9 +148,9 @@ 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/| = updated secrets.json| - 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| - \[.*\] STARTING APPLY| - \[.*\] APPLY COMPLETE'
+ FILTER_CLI='= read|= loading|= no change| - executing| = executing| = applying| = ran git| = checking| = synching| = skipping file_path| - cd .*; rsync -| - hiera| = created hiera/| = updated hiera/| = updated secrets.json| - 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| - \[.*\] STARTING APPLY| - \[.*\] APPLY COMPLETE|net.ssh.authentication.agent.*could not connect to ssh-agent'
- FILTER_PUPPET="] notice: |] No change to hostname|] Puppet apply complete \(changes made\).|] warning: Dynamic lookup|] warning: Scope\(Class|Skipping because of failed dependencies|warning: You cannot collect without storeconfigs being set|warning: default \`to_a' will be obsolete"
+ FILTER_PUPPET="] notice: |] No change to hostname|] Puppet apply complete \(changes made\).|] warning: Dynamic lookup|] warning: Scope\(Class|Skipping because of failed dependencies|warning: You cannot collect without storeconfigs being set|warning: Not collecting exported resources without storeconfigs|warning: default \`to_a' will be obsolete"
if [ -n "$FILTER_COMMON" ]
then