881696 - Clean up TBPL Chief deploy config

Status: RESOLVED FIXED

(Tree Management Graveyard :: TBPL, defect)

Description

[Ed Morley [:emorley]]

Example of current output:

I am trying to load /data/genericrhel6/src/tbpl.mozilla.org/tbpl/scripts/update/update.py
[2013-05-31 12:50:12] Running pre_update
[2013-05-31 12:50:12] Running update_code
[2013-05-31 12:50:12] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg incoming -r c487ac1483f3 --template '{node|short} | {desc|firstline}
[localhost] running: '
[2013-05-31 12:50:13] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg incoming -r c487ac1483f3 --template '{node|short} | {desc|firstline}
[localhost] finished: ' (1.043s)
[localhost] out: comparing with http://hg.mozilla.org/webtools/tbpl
[localhost] out: searching for changes
[localhost] out: 5d82480df2b6 | Bug 876829 - Remove Gaia-* trees; r=philor
[localhost] out: c487ac1483f3 | Bug 878190 - Add the mozilla-b2g18_v1_1_0hd tree. r=edmorley
[2013-05-31 12:50:13] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -r c487ac1483f3 -u -v
[2013-05-31 12:50:15] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg pull -r c487ac1483f3 -u -v (1.656s)
[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 2 changes to 1 files
[localhost] out: resolving manifests
[localhost] out: getting js/Config.js
[localhost] out: 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
[2013-05-31 12:50:15] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && find . -type f -name '.gitignore' -or -name '*.pyc' -delete
[2013-05-31 12:50:15] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && find . -type f -name '.gitignore' -or -name '*.pyc' -delete (0.260s)
[2013-05-31 12:50:15] [localhost] running: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent > cache/revision_info.txt
[2013-05-31 12:50:15] [localhost] finished: cd /data/genericrhel6/src/tbpl.mozilla.org/tbpl && hg parent > cache/revision_info.txt (0.259s)
[2013-05-31 12:50:15] Finished update_code (3.220s)
[2013-05-31 12:50:15] Finished pre_update (3.220s)
I am trying to load /data/genericrhel6/src/tbpl.mozilla.org/tbpl/scripts/update/update.py
[2013-05-31 12:50:15] Running update
[2013-05-31 12:50:15] Running checkin_changes
[2013-05-31 12:50:15] [localhost] running: /data/genericrhel6/deploy -n tbpl.mozilla.org
[2013-05-31 12:50:22] [localhost] finished: /data/genericrhel6/deploy -n tbpl.mozilla.org (6.013s)
[localhost] err: [2013-05-31 12:50:16] Running rsync_project
[localhost] err: [2013-05-31 12:50:16] [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-05-31 12:50:16] [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.202s)
[localhost] err: [2013-05-31 12:50:16] Finished rsync_project (0.203s)
[localhost] err: [2013-05-31 12:50:16] Running commit_www
[localhost] err: [2013-05-31 12:50:16] [localhost] running: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['tbpl.mozilla.org']'
[localhost] err: [2013-05-31 12:50:21] [localhost] finished: cd /data/genericrhel6/www && /usr/bin/git add .; /usr/bin/git commit -a -m 'deploy ['tbpl.mozilla.org']' (5.734s)
[localhost] err: [localhost] out: [master a4dd517] deploy [tbpl.mozilla.org]
[localhost] err: [localhost] out: Committer: root <[e-mail]>
[localhost] err: [localhost] out: Your name and email address were configured automatically based
[localhost] err: [localhost] out: on your username and hostname. Please check that they are accurate.
[localhost] err: [localhost] out: You can suppress this message by setting them explicitly:
[localhost] err: [localhost] out:
[localhost] err: [localhost] out: git config --global user.name "Your Name"
[localhost] err: [localhost] out: git config --global user.email [e-mail]
[localhost] err: [localhost] out:
[localhost] err: [localhost] out: After doing this, you may fix the identity used for this commit with:
[localhost] err: [localhost] out:
[localhost] err: [localhost] out: git commit --amend --reset-author
[localhost] err: [localhost] out:
[localhost] err: [localhost] out: 2 files changed, 7 insertions(+), 18 deletions(-)
[localhost] err: [2013-05-31 12:50:21] Finished commit_www (5.735s)
[2013-05-31 12:50:22] Finished checkin_changes (6.013s)
[2013-05-31 12:50:22] Finished update (6.013s)
I am trying to load /data/genericrhel6/src/tbpl.mozilla.org/tbpl/scripts/update/update.py
[2013-05-31 12:50:22] Running deploy
[2013-05-31 12:50:22] Running deploy_app
[2013-05-31 12:50:22] [generic1.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org
[2013-05-31 12:50:22] [generic2.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org
[2013-05-31 12:50:22] [generic3.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org
[2013-05-31 12:50:22] [generic4.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org
[2013-05-31 12:50:22] [generic5.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org
[2013-05-31 12:50:22] [generic102.webapp.phx1.mozilla.com] running: /data/bin/update-www.sh tbpl.mozilla.org
[2013-05-31 12:50:28] [generic2.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (6.456s)
[generic2.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/
[2013-05-31 12:50:28] [generic3.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (6.518s)
[generic3.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/
[2013-05-31 12:50:28] [generic4.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (6.534s)
[generic4.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/
[2013-05-31 12:50:28] [generic5.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (6.747s)
[generic5.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/
[2013-05-31 12:50:29] [generic102.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (7.110s)
[generic102.webapp.phx1.mozilla.com] out: Not removing ship-it.mozilla.org/release-kickoff/logs/
[2013-05-31 12:50:30] [generic1.webapp.phx1.mozilla.com] finished: /data/bin/update-www.sh tbpl.mozilla.org (8.148s)
[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-05-31 12:50:30] Finished deploy_app (8.149s)
[2013-05-31 12:50:30] Finished deploy (8.149s)


= a bit over the top, doesn't give a changelog URL etc.

Going to clean up the parts of the config that I can change (the checked in parts, namely the 'update_code' step.

Comment 1

[Ed Morley [:emorley]]

Attachment: Patch v1

* Replaces the |hg incoming| output with a changelog URL.
* Removes the deletion of .gitignore (since this is a mercurial repo) and .pyc (since it's being run in the srcdir, where the pyc files will not be generated, since they are never run there).
* Makes the output dumped in the revision_info.txt file more concise.

In another bug I'll address the warning spam from the commit_www step, since that requires changes to the deploy scripts and/or global git configs.

Comment 2

[Ed Morley [:emorley]]

Oh and makes the revision_info.txt steps not be output, since they are not necessary for the push itself & add to the spam whilst giving little value.

Comment 3

[Brandon Burton [:solarce]]

Looks fine to me

Comment 4

[Ed Morley [:emorley]]

Thank you :-)

https://hg.mozilla.org/webtools/tbpl/rev/3ff9741766c2

Comment 5

[Ed Morley [:emorley]]

I've pushed this to tbpl-dev using chief, and then run chief again requesting the same rev, to see what the new output was like. However, the old script is still being run (http://genericadm.private.phx1.mozilla.com/chief/tbpl.dev/history). Are the scripts cached/Chief need restarting?

Comment 6

[Brandon Burton [:solarce]]

It's not cached but due to how we use a local git repo on the admin node for deployments you'll need to make a commit past this new script one and push that

Comment 7

[Ed Morley [:emorley]]

(In reply to Brandon Burton [:solarce] from comment #6)
> It's not cached but due to how we use a local git repo on the admin node for
> deployments you'll need to make a commit past this new script one and push
> that

Unfortunately that still didn't work:
http://genericadm.private.phx1.mozilla.com/chief/tbpl.dev/logs/95665145fba1.1370964975

The script appears to be running from the src dir which was updated by the first commit iiuc?

Comment 8

[Ed Morley [:emorley]]

Ok so turns out that the scripts that were checked into the tree (as part of bug 827473) were in "scripts/updates/" rather than "scripts/update/".

Moved to the correct location in:
https://hg.mozilla.org/webtools/tbpl/rev/dd1533bed1d3

Couple of followups to the script itself:
https://hg.mozilla.org/webtools/tbpl/rev/4cff5bbf33d8
https://hg.mozilla.org/webtools/tbpl/rev/d6881313fe66

New example output (of the update_code section):
{
I am trying to load /data/genericrhel6-dev/src/tbpl-dev.allizom.org/tbpl/scripts/update/update.py
[2013-06-11 09:52:31] Running pre_update
[2013-06-11 09:52:31] Running update_code
[2013-06-11 09:52:31] [localhost] running: cd /data/genericrhel6-dev/src/tbpl-dev.allizom.org/tbpl && hg parent --template 'Changelog: https://hg.mozilla.org/webtools/tbpl/pushloghtml?fromchange={node|short}&tochange=d6881313fe66'
[2013-06-11 09:52:31] [localhost] finished: cd /data/genericrhel6-dev/src/tbpl-dev.allizom.org/tbpl && hg parent --template 'Changelog: https://hg.mozilla.org/webtools/tbpl/pushloghtml?fromchange={node|short}&tochange=d6881313fe66' (0.056s)
[localhost] out: Changelog: https://hg.mozilla.org/webtools/tbpl/pushloghtml?fromchange=d6881313fe66&tochange=d6881313fe66
[2013-06-11 09:52:31] [localhost] running: cd /data/genericrhel6-dev/src/tbpl-dev.allizom.org/tbpl && hg pull -u -v -r d6881313fe66
[2013-06-11 09:52:31] [localhost] finished: cd /data/genericrhel6-dev/src/tbpl-dev.allizom.org/tbpl && hg pull -u -v -r d6881313fe66 (0.556s)
[localhost] out: pulling from http://hg.mozilla.org/webtools/tbpl
[localhost] out: no changes found
[2013-06-11 09:52:31] [localhost] running: cd /data/genericrhel6-dev/src/tbpl-dev.allizom.org/tbpl && hg parent --template '{node|short} | {desc}
[localhost] running: ' > cache/revision_info.txt
[2013-06-11 09:52:31] [localhost] finished: cd /data/genericrhel6-dev/src/tbpl-dev.allizom.org/tbpl && hg parent --template '{node|short} | {desc}
[localhost] finished: ' > cache/revision_info.txt (0.055s)
[2013-06-11 09:52:31] Finished update_code (0.668s)
}

Bug 881721 will handle some more of the spam from the later steps.

Comment 9

[Ed Morley [:emorley]]

And now on prod too (after the one-off manual update to resolve the checked-in vs working directory differences) :-)