Skip to content

Commit d1251d2

Browse files
committed
Adjusted build host policy to clean up CFEngine install more for safety during build
We install CFEngine, but if by source then package remove won't clean up at all. Even a package remove can leave bits in /var/cfengine and /opt/cfengine so remove those explicitly. Ticket: ENT-13016 Changelog: none
1 parent 947a821 commit d1251d2

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

ci/setup-cfengine-build-host.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,14 @@ function cleanup()
8080
echo "No supported package manager to uninstall cfengine."
8181
exit 1
8282
fi
83-
echo "Ensuring CFEngine fully uninstalled/cleaned up"
84-
# keep these logs around for debugging failed setup runs
85-
# rm -rf /var/cfengine /opt/cfengine /var/log/CFE* /var/log/postgresql.log || true
83+
echo "Cleaning up CFEngine install by moving to /var/bak.cfengine and /opt/bak.cfengine"
84+
rm -rf /var/bak.cfengine
85+
mv /var/cfengine /var/bak.cfengine || true
86+
rm -rf /opt/bak.cfengine
87+
mv /opt/cfengine /opt/bak.cfengine || true
88+
mv /var/log/CFE* /var/bak.cfengine/ ||| true
89+
mv /var/log/postgresql.log /var/bak.cfengine || true
90+
8691
if command -v pkill; then
8792
pkill -9 cf-agent || true
8893
pkill -9 cf-serverd || true

0 commit comments

Comments
 (0)