summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Runner <gitlab-runner@greyhound.leap.se>2016-07-02 18:32:34 +0000
committerGitLab Runner <gitlab-runner@greyhound.leap.se>2016-07-02 18:32:34 +0000
commit2b417e74b5caeefc7b9f2c9c0f1283673f04fca2 (patch)
treee6278c102aa4ceced0447d4225e3e2c7c58cc078
parent68905faf4ae88dd87dc3373f7e8181ae999a9821 (diff)
fix puppet msg filter after cli->platform move
-rwxr-xr-xleap-platform-test10
1 files changed, 6 insertions, 4 deletions
diff --git a/leap-platform-test b/leap-platform-test
index 2dd7f9e..6c0d3ca 100755
--- a/leap-platform-test
+++ b/leap-platform-test
@@ -159,15 +159,17 @@ deploy() {
# until puppet errors show up in verbose level 0 +1 (#1750)
FILTER_CLI=' - \[.*\] Changed /etc/hostname to| - \[.*\] Changed hostname to|= 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|Deploying | - mx/dkim.pub, mx/dkim.key -> .*/srv/leap/files'
- 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|Warning: Found multiple default providers for vcsrepo"
+ FILTER_PUPPET="] notice: |^Notice: |] No change to hostname|] Puppet apply complete \(changes made\).|] completed in |] 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|Warning: Found multiple default providers for vcsrepo"
- FILTER_PUPPET_DEPREC="templatewrapper.rb:76:in \`method_missing"
+ #FILTER_PUPPET_DEPREC="templatewrapper.rb:76:in \`method_missing"
if [ -n "$FILTER_COMMON" ]
then
- FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_PUPPET_DEPREC|$FILTER_COMMON)"
+ #FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_PUPPET_DEPREC|$FILTER_COMMON)"
+ FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_COMMON)"
else
- FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_PUPPET_DEPREC)"
+ #FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_PUPPET_DEPREC)"
+ FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET)"
fi