From 7ccd7c1c39e6463f589d348f35b83ec192cee0dd Mon Sep 17 00:00:00 2001 From: Leap Admins Date: Fri, 19 Jul 2013 13:42:47 +0000 Subject: removed extra vagrant branch for leap_cli, updated filter --- leap-platform-test | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/leap-platform-test b/leap-platform-test index 333652e..980114c 100755 --- a/leap-platform-test +++ b/leap-platform-test @@ -92,7 +92,7 @@ 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 -a| - hiera| = created hiera/| - cd /root/| - rolling backexecuting| - files/ca/client_ca.crt|\[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/| - cd /root/| - rolling backexecuting| - files/ca/client_ca.crt|\[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_PUPPET='] notice: |] No change to hostname|] Puppet apply complete|] warning: Dynamic lookup|] warning: Scope\(Class' FILTER_ALL="($FILTER_CLI|$FILTER_PUPPET)" @@ -184,8 +184,7 @@ wait_for_node() { update_leap_cli () { cd $LEAP_SRC - git fetch - git reset origin/vagrant_1.2 --hard + git pull } @@ -201,11 +200,6 @@ versions () { cd $LEAP_SRC cli_head=`git rev-parse HEAD` - if cli_head='edcb76a30bc0e13b9bf590cbd9f7f12d41a2cc13' - then - # rebased vagrant_1.2 commit, take the last one for latest master commit - cli_head=`git rev-parse HEAD^` - fi cli_commit=`git show $cli_head | head -5` cd $PROVIDERDIR -- cgit v1.2.3