[localhost] out: Changelog: https://hg.mozilla.org/webtools/tbpl/pushloghtml?fromchange=96d1479b213a&tochange=f3639f2c9462 [2013-06-25 07:45:15] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -u -v -r f3639f2c9462 [2013-06-25 07:45:18] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -u -v -r f3639f2c9462 (3.525s) [localhost] out: pulling from http://hg.mozilla.org/webtools/tbpl [localhost] out: searching for changes [localhost] out: all local heads known remotely [localhost] out: adding changesets [localhost] out: adding manifests [localhost] out: adding file changes [localhost] out: added 128 changesets with 282 changes to 79 files [localhost] out: resolving manifests [localhost] out: couldn't find merge tool ecmerge [localhost] out: couldn't find merge tool filemerge [localhost] out: couldn't find merge tool gpyfm [localhost] out: couldn't find merge tool kdiff3 [localhost] out: couldn't find merge tool meld [localhost] out: couldn't find merge tool bcompare [localhost] out: couldn't find merge tool UltraCompare [localhost] out: couldn't find merge tool araxis [localhost] out: couldn't find merge tool beyondcompare3 [localhost] out: couldn't find merge tool diffuse [localhost] out: couldn't find merge tool diffmerge [localhost] out: couldn't find merge tool p4merge [localhost] out: couldn't find merge tool tkdiff [localhost] out: couldn't find merge tool tortoisemerge [localhost] out: couldn't find merge tool xxdiff [localhost] out: couldn't find merge tool gvimdiff [localhost] out: merging dataimport/import-buildbot-data.py [localhost] out: getting js/Config.js [localhost] out: getting js/UserInterface.js [localhost] out: getting mcmerge/LICENSE [localhost] out: getting mcmerge/README.md [localhost] out: getting mcmerge/css/opensans.woff [localhost] out: getting mcmerge/css/style.css [localhost] out: getting mcmerge/images/background.png [localhost] out: getting mcmerge/images/holly.png [localhost] out: getting mcmerge/images/sky.png [localhost] out: getting mcmerge/images/snowy.jpg [localhost] out: getting mcmerge/index.html [localhost] out: getting mcmerge/js/BugData.js [localhost] out: getting mcmerge/js/Config.js [localhost] out: getting mcmerge/js/ConfigurationData.js [localhost] out: getting mcmerge/js/DebugUI.js [localhost] out: getting mcmerge/js/FlagLoader.js [localhost] out: getting mcmerge/js/PushData.js [localhost] out: getting mcmerge/js/Remapper.js [localhost] out: getting mcmerge/js/Step.js [localhost] out: getting mcmerge/js/Summary.js [localhost] out: getting mcmerge/js/UI.js [localhost] out: getting mcmerge/js/Utils.js [localhost] out: getting mcmerge/js/Viewer.js [localhost] out: getting mcmerge/js/ViewerController.js [localhost] out: getting mcmerge/js/mcMerge.js [localhost] out: getting mcmerge/php/getFlags.php [localhost] out: getting mcmerge/thirdparty/bzjs/LICENSE [localhost] out: getting mcmerge/thirdparty/bzjs/bz.js [localhost] out: getting mcmerge/thirdparty/chai/LICENSE [localhost] out: getting mcmerge/thirdparty/chai/chai.js [localhost] out: getting mcmerge/thirdparty/jquery/MIT-LICENSE.txt [localhost] out: getting mcmerge/thirdparty/jquery/jquery-1.7.2.min.js [localhost] out: getting mcmerge/thirdparty/mocha/LICENSE [localhost] out: getting mcmerge/thirdparty/mocha/mocha.css [localhost] out: getting mcmerge/thirdparty/mocha/mocha.js [localhost] out: getting mcmerge/thirdparty/requirejs/LICENSE [localhost] out: getting mcmerge/thirdparty/requirejs/require.js [localhost] out: getting mcmerge/thirdparty/toast/grid.css [localhost] out: getting mcmerge/thirdparty/toast/reset.css [localhost] out: getting mcmerge/thirdparty/toast/toast.css [localhost] out: getting mcmerge/thirdparty/toast/type.css [localhost] out: 41 files updated, 1 files merged, 0 files removed, 0 files unresolved [2013-06-25 07:45:18] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent --template '{node|short} | {desc} [localhost] running: ' > cache/revision_info.txt [2013-06-25 07:45:19] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent --template '{node|short} | {desc} [localhost] finished: ' > cache/revision_info.txt (0.231s) [2013-06-25 07:45:19] Finished update_code (4.254s) [2013-06-25 07:45:19] Finished pre_update (4.254s) I am trying to load /data/genericrhel6/src/tbpl.mozilla.org/tbpl/scripts/update/update.py [2013-06-25 07:45:19] Running update [2013-06-25 07:45:19] Running checkin_changes [2013-06-25 07:45:19] [localhost] running: /data/genericrhel6/deploy -n tbpl.mozilla.org [2013-06-25 07:45:20] [localhost] failed: /data/genericrhel6/deploy -n tbpl.mozilla.org (1.079s) [localhost] err: [2013-06-25 07:45:19] Running rsync_project [localhost] err: [2013-06-25 07:45:19] [localhost] running: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --exclude '.bzr*' --delete /data/genericrhel6/src/tbpl.mozilla.org/ /data/genericrhel6/www/tbpl.mozilla.org/ [localhost] err: [2013-06-25 07:45:19] [localhost] finished: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --exclude '.bzr*' --delete /data/genericrhel6/src/tbpl.mozilla.org/ /data/genericrhel6/www/tbpl.mozilla.org/ (0.159s) [localhost] err: [2013-06-25 07:45:19] Finished rsync_project (0.160s) [localhost] err: [2013-06-25 07:45:19] Running commit_www [localhost] err: [2013-06-25 07:45:19] [localhost] running: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['tbpl.mozilla.org']' [localhost] err: [2013-06-25 07:45:20] [localhost] failed: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['tbpl.mozilla.org']' (0.787s) [localhost] err: [localhost] err: fatal: Unable to create '/data/genericrhel6/www/.git/index.lock': File exists. [localhost] err: [localhost] err: [localhost] err: [localhost] err: If no other git process is currently running, this probably means a [localhost] err: [localhost] err: git process crashed in this repository earlier. Make sure no other git [localhost] err: [localhost] err: process is running and remove the file manually to continue. [localhost] err: [localhost] err: fatal: Unable to create '/data/genericrhel6/www/.git/index.lock': File exists. [localhost] err: [localhost] err: [localhost] err: [localhost] err: If no other git process is currently running, this probably means a [localhost] err: [localhost] err: git process crashed in this repository earlier. Make sure no other git [localhost] err: [localhost] err: process is running and remove the file manually to continue.

Trying again gives: { I am trying to load /data/genericrhel6/src/tbpl.mozilla.org/tbpl/scripts/update/update.py [2013-06-25 07:48:09] Running pre_update [2013-06-25 07:48:09] Running update_code [2013-06-25 07:48:09] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent --template 'Changelog: https://hg.mozilla.org/webtools/tbpl/pushloghtml?fromchange={node|short}&tochange=f3639f2c9462' [2013-06-25 07:48:09] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent --template 'Changelog: https://hg.mozilla.org/webtools/tbpl/pushloghtml?fromchange={node|short}&tochange=f3639f2c9462' (0.049s) [localhost] out: Changelog: https://hg.mozilla.org/webtools/tbpl/pushloghtml?fromchange=f3639f2c9462&tochange=f3639f2c9462 [2013-06-25 07:48:09] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -u -v -r f3639f2c9462 [2013-06-25 07:48:10] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -u -v -r f3639f2c9462 (0.602s) [localhost] out: pulling from http://hg.mozilla.org/webtools/tbpl [localhost] out: no changes found [2013-06-25 07:48:10] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent --template '{node|short} | {desc} [localhost] running: ' > cache/revision_info.txt [2013-06-25 07:48:10] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent --template '{node|short} | {desc} [localhost] finished: ' > cache/revision_info.txt (0.052s) [2013-06-25 07:48:10] Finished update_code (0.703s) [2013-06-25 07:48:10] Finished pre_update (0.704s) I am trying to load /data/genericrhel6/src/tbpl.mozilla.org/tbpl/scripts/update/update.py [2013-06-25 07:48:10] Running update [2013-06-25 07:48:10] Running checkin_changes [2013-06-25 07:48:10] [localhost] running: /data/genericrhel6/deploy -n tbpl.mozilla.org [2013-06-25 07:48:16] [localhost] failed: /data/genericrhel6/deploy -n tbpl.mozilla.org (6.321s) [localhost] err: [2013-06-25 07:48:10] Running rsync_project [localhost] err: [2013-06-25 07:48:10] [localhost] running: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --exclude '.bzr*' --delete /data/genericrhel6/src/tbpl.mozilla.org/ /data/genericrhel6/www/tbpl.mozilla.org/ [localhost] err: [2013-06-25 07:48:10] [localhost] finished: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --exclude '.bzr*' --delete /data/genericrhel6/src/tbpl.mozilla.org/ /data/genericrhel6/www/tbpl.mozilla.org/ (0.048s) [localhost] err: [2013-06-25 07:48:10] Finished rsync_project (0.049s) [localhost] err: [2013-06-25 07:48:10] Running commit_www [localhost] err: [2013-06-25 07:48:10] [localhost] running: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['tbpl.mozilla.org']' [localhost] err: [2013-06-25 07:48:16] [localhost] failed: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['tbpl.mozilla.org']' (6.237s) [localhost] err: [localhost] out: # On branch master [localhost] err: [localhost] out: nothing to commit (working directory clean) } And the updated revision isn't in production :-(

Pushed to the TBPL repo again (bug 886823) so the deploy script won't complain about no changes. { [localhost] out: Changelog: https://hg.mozilla.org/webtools/tbpl/pushloghtml?fromchange=f3639f2c9462&tochange=62347496eda9 [2013-06-25 08:13:23] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -u -v -r 62347496eda9 [2013-06-25 08:13:23] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -u -v -r 62347496eda9 (0.948s) [localhost] out: pulling from http://hg.mozilla.org/webtools/tbpl [localhost] out: searching for changes [localhost] out: all local heads known remotely [localhost] out: adding changesets [localhost] out: adding manifests [localhost] out: adding file changes [localhost] out: added 2 changesets with 0 changes to 0 files [localhost] out: resolving manifests [localhost] out: 0 files updated, 0 files merged, 0 files removed, 0 files unresolved [2013-06-25 08:13:23] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent --template '{node|short} | {desc} [localhost] running: ' > cache/revision_info.txt [2013-06-25 08:13:24] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent --template '{node|short} | {desc} [localhost] finished: ' > cache/revision_info.txt (0.052s) [2013-06-25 08:13:24] Finished update_code (1.062s) [2013-06-25 08:13:24] Finished pre_update (1.062s) I am trying to load /data/genericrhel6/src/tbpl.mozilla.org/tbpl/scripts/update/update.py [2013-06-25 08:13:24] Running update [2013-06-25 08:13:24] Running checkin_changes [2013-06-25 08:13:24] [localhost] running: /data/genericrhel6/deploy -n tbpl.mozilla.org [2013-06-25 08:13:29] [localhost] finished: /data/genericrhel6/deploy -n tbpl.mozilla.org (5.505s) [localhost] err: [2013-06-25 08:13:24] Running rsync_project [localhost] err: [2013-06-25 08:13:24] [localhost] running: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --exclude '.bzr*' --delete /data/genericrhel6/src/tbpl.mozilla.org/ /data/genericrhel6/www/tbpl.mozilla.org/ [localhost] err: [2013-06-25 08:13:24] [localhost] finished: /usr/bin/rsync -aq --include '.gitkeep' --exclude '.git*' --exclude '.hg*' --exclude '.svn*' --exclude 'CVS' --exclude '.bzr*' --delete /data/genericrhel6/src/tbpl.mozilla.org/ /data/genericrhel6/www/tbpl.mozilla.org/ (0.048s) [localhost] err: [2013-06-25 08:13:24] Finished rsync_project (0.049s) [localhost] err: [2013-06-25 08:13:24] Running commit_www [localhost] err: [2013-06-25 08:13:24] [localhost] running: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['tbpl.mozilla.org']' [localhost] err: [2013-06-25 08:13:29] [localhost] finished: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['tbpl.mozilla.org']' (5.422s) [localhost] err: [localhost] out: [master 7cbfcd1] deploy [tbpl.mozilla.org] [localhost] err: [localhost] out: 1 file changed, 1 insertion(+), 1 deletion(-) [localhost] err: [2013-06-25 08:13:29] Finished commit_www (5.423s) [2013-06-25 08:13:29] Finished checkin_changes (5.506s) [2013-06-25 08:13:29] Finished update (5.506s) I am trying to load /data/genericrhel6/src/tbpl.mozilla.org/tbpl/scripts/update/update.py [2013-06-25 08:13:29] Running deploy [2013-06-25 08:13:29] Running deploy_app [2013-06-25 08:13:29] [generic1.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org [2013-06-25 08:13:29] [generic2.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org [2013-06-25 08:13:29] [generic3.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org [2013-06-25 08:13:29] [generic4.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org [2013-06-25 08:13:29] [generic5.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org [2013-06-25 08:13:29] [generic102.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org [2013-06-25 08:13:36] [generic4.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (6.491s) [generic4.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/ [2013-06-25 08:13:36] [generic3.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (6.847s) [generic3.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/ [2013-06-25 08:13:36] [generic5.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (7.059s) [generic5.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/ [2013-06-25 08:13:37] [generic102.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (7.521s) [generic102.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/ [2013-06-25 08:13:37] [generic2.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (7.896s) [generic2.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/ [2013-06-25 08:13:37] [generic1.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (8.371s) [generic1.webapp.phx1.mozilla.com] out: Not removing fhr.cdn.mozilla.net/web-output.orig/ [generic1.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/ [2013-06-25 08:13:37] Finished deploy_app (8.372s) [2013-06-25 08:13:37] Finished deploy (8.372s) } Yey \o/