... because we are going to use puppetles spot instances ATM we use it only for Ubuntu and Mac (not for builders). /tmp is cleanup up at boot time by default. We should make sure to delete $::users::builder::home/.mozilla/firefox/console.log on boot.

These should go into the pre-run scripts, right?

(In reply to Dustin J. Mitchell [:dustin] from comment #2) > These should go into the pre-run scripts, right? Actually, yes. There would be no need to install extra packages, such as tmpreaper, tmpwatch, etc.

Ian, just to put this on your radar :)

CentOS only for now.

Comment on attachment 8484243 [details] [diff] [review] tmpclean-puppet.diff Review of attachment 8484243 [details] [diff] [review]: ----------------------------------------------------------------- ::: modules/runner/templates/tasks/cleanup.erb @@ +8,5 @@ > + > +if [ "$USER" != "<%= scope.lookupvar('::config::builder_username') %>" ]; then > + sudo -E -u <%= scope.lookupvar('::config::builder_username') %> $0 $* > + exit $? > +fi so, do we actually want to sudo here? it's more likely we can delete files in /home and /tmp as root, right?

(In reply to Chris AtLee [:catlee] from comment #6) > Comment on attachment 8484243 [details] [diff] [review] > tmpclean-puppet.diff > > Review of attachment 8484243 [details] [diff] [review]: > ----------------------------------------------------------------- > > ::: modules/runner/templates/tasks/cleanup.erb > @@ +8,5 @@ > > + > > +if [ "$USER" != "<%= scope.lookupvar('::config::builder_username') %>" ]; then > > + sudo -E -u <%= scope.lookupvar('::config::builder_username') %> $0 $* > > + exit $? > > +fi > > so, do we actually want to sudo here? it's more likely we can delete files > in /home and /tmp as root, right? Per http://www.explainshell.com/explain?cmd=sudo+-E+-u++cltbld+%240+%24* -u user The -u (user) option causes sudo to run the specified command as a user other than root. To specify a uid instead of a user name, use #uid. When running commands as a uid, many shells require that the '#' be escaped with a backslash ('\'). Security policies may restrict uids to those listed in the password database. The sudoers policy allows uids that are not in the password database as long as the targetpw option is not set. Other security policies may not support this.

(In reply to Justin Wood (:Callek) from comment #7) > (In reply to Chris AtLee [:catlee] from comment #6) > > so, do we actually want to sudo here? it's more likely we can delete files > > in /home and /tmp as root, right? > (err re-read your Q, and forgive me jumping in, /me goes to relearn how to read)

(In reply to Chris AtLee [:catlee] from comment #6) > so, do we actually want to sudo here? it's more likely we can delete files > in /home and /tmp as root, right? I think you are right, no sudo here. It would fail cleaning up /tmp

Comment on attachment 8484366 [details] [diff] [review] tmpclean-puppet-1.diff We may need to avoid cleaning up /tmp if we run runner multiple times without reboots.

This changes the cleanup bash script just a bit, and applies the change to all the places where tweaks::cleanup was before. This is now possible since runner works on OSX.

Comment on attachment 8526563 [details] [diff] [review] cleanup-osx-and-linux.diff Review of attachment 8526563 [details] [diff] [review]: ----------------------------------------------------------------- ::: modules/runner/templates/tasks/cleanup.erb @@ +8,5 @@ > + > +BUILDER_HOME="<%= scope.lookupvar('::users::builder::home') %>" > + > +if [ $(uname) = "Darwin" ]; then > + rm -fv "${BUILDER_HOME}/.mozilla/firefox/console.log" I think the logic should be inverted here, Darwin should remove "${BUILDER_HOME}/Library/Application Support/Firefox/console.log"

Comment on attachment 8526563 [details] [diff] [review] cleanup-osx-and-linux.diff Review of attachment 8526563 [details] [diff] [review]: ----------------------------------------------------------------- Derp, yes!

Testing this out over the weekend, will merge if all goes well. :)

http://buildbot-master82.srv.releng.scl3.mozilla.com:8001/buildslaves/b-linux64-hp-0028 http://buildbot-master108.srv.releng.scl3.mozilla.com:8201/buildslaves/t-snow-r4-0008 ^ testing on

Comment on attachment 8526750 [details] [diff] [review] cleanup-osx-and-linux.diff Review of attachment 8526750 [details] [diff] [review]: ----------------------------------------------------------------- LGTM!

Okay, this seems to be working out. Shipping it!