diff options
| author | varac <varacanero@zeromail.org> | 2016-01-20 10:37:02 +0000 |
|---|---|---|
| committer | varac <varacanero@zeromail.org> | 2016-01-20 10:37:08 +0000 |
| commit | 9d4953be78c39b478c9ede5fe2a138de6193911c (patch) | |
| tree | 01c98e14001d720535bf8248e8bcccfc1d6e4ca7 | |
| parent | 8b43ea92ad5641c5875d9ef6b82bd462e4995ee4 (diff) | |
extended puppet msg blacklist, make update_platform() failsafe
| -rwxr-xr-x | leap-platform-test | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/leap-platform-test b/leap-platform-test index fd1fa06..28fb2aa 100755 --- a/leap-platform-test +++ b/leap-platform-test @@ -156,13 +156,15 @@ deploy() { # 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|net.ssh.authentication.agent.*could not connect to ssh-agent|Deploying ' - 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" + 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_DEPREC="templatewrapper.rb:76:in \`method_missing" if [ -n "$FILTER_COMMON" ] then - FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_COMMON)" + FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_PUPPET_DEPREC|$FILTER_COMMON)" else - FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET)" + FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET|$FILTER_PUPPET_DEPREC)" fi @@ -494,6 +496,7 @@ update_platform () { git clean -f git fetch + git checkout master git branch -D $PLATFORM_BRANCH git checkout -b $PLATFORM_BRANCH origin/$PLATFORM_BRANCH |