[autotest] Use chromeos-admin sync code
BUG=chromium:716801
TEST=None
Change-Id: Ib95d3fa3cb354ee0e7315edb9041663fce6565c8
Reviewed-on: https://chromium-review.googlesource.com/492486
Commit-Ready: Allen Li <ayatane@chromium.org>
Tested-by: Allen Li <ayatane@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
diff --git a/contrib/deploy_puppet.sh b/contrib/deploy_puppet.sh
index d2ea3ed..c858bc8 100755
--- a/contrib/deploy_puppet.sh
+++ b/contrib/deploy_puppet.sh
@@ -86,13 +86,8 @@
echo -e "\n**************************************************\n"
for host in ${hosts}; do
- git_pull="ssh -t ${host} -- 'sudo git --work-tree=/root/chromeos-admin --git-dir=/root/chromeos-admin/.git pull'"
- run_puppet="ssh ${host} -- 'sudo /root/chromeos-admin/puppet/run_puppet'"
+ run_puppet="ssh ${host} -- 'sudo /root/chromeos-admin/puppet/sync_and_run_puppet -f'"
echo -e "\n********** Processing ${host} ****************\n"
- echo "[Running] ${git_pull}"
- if [ "${DRYRUN}" != "TRUE" ]; then
- eval ${git_pull}
- fi
echo "[Running] ${run_puppet}"
if [ "${DRYRUN}" != "TRUE" ]; then
eval ${run_puppet}