Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ci/setup-cfengine-build-host.sh
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ function cleanup()
fi
ls -l /home
chown -R jenkins /home/jenkins
echo "Done with cleanup()"
}

trap cleanup ERR
Expand Down Expand Up @@ -190,7 +191,7 @@ if ! /var/cfengine/bin/cf-agent -V; then
pip install cf-remote
fi
if command -v cf-remote >/dev/null; then
cf-remote --version master install --clients localhost
cf-remote --log-level info --version master install --clients localhost || true
fi
fi

Expand Down Expand Up @@ -227,6 +228,8 @@ cp -a masterfiles/* /var/cfengine/inputs/
grep -i error: promises.log && exit 1
/var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee -a promises.log
grep -i error: promises.log && exit 1
echo "Done evaluating policy. End of promies.log:"
tail promises.log
)

cleanup