1135798 - update.py does not update source correctly when switching branches

Status: RESOLVED FIXED

(Tree Management :: Treeherder: Infrastructure, defect, P1)

Description

[Ed Morley [:emorley]]

http://treeherderadm.private.scl3.mozilla.com/chief/treeherder.prod/logs/master.1424720204

[2015-02-23 19:36:44] Running pre_update
[2015-02-23 19:36:44] [localhost] running: cd /data/treeherder/src/treeherder.mozilla.org/treeherder-service && git fetch --prune
[2015-02-23 19:36:45] [localhost] finished: cd /data/treeherder/src/treeherder.mozilla.org/treeherder-service && git fetch --prune (0.813s)
[localhost] err: From https://github.com/mozilla/treeherder-service
[localhost] err: fd7cd20..6fca7fe  master     -> origin/master
[localhost] err: + cebde6a...28a5880 new-structured-log-viewer -> origin/new-structured-log-viewer  (forced update)
[2015-02-23 19:36:45] [localhost] running: cd /data/treeherder/src/treeherder.mozilla.org/treeherder-service && git reset FETCH_HEAD --hard
[2015-02-23 19:36:45] [localhost] finished: cd /data/treeherder/src/treeherder.mozilla.org/treeherder-service && git reset FETCH_HEAD --hard (0.013s)
[localhost] out: HEAD is now at e063922 Bug 1119479 - Fix update script and puppet manifest
[2015-02-23 19:36:45] [localhost] running: cd /data/treeherder/src/treeherder.mozilla.org/treeherder-service && git checkout master
[2015-02-23 19:36:45] [localhost] finished: cd /data/treeherder/src/treeherder.mozilla.org/treeherder-service && git checkout master (0.037s)
[localhost] out: Your branch is behind 'origin/master' by 17 commits, and can be fast-forwarded.
[localhost] out: (use "git pull" to update your local branch)
[localhost] err: Switched to branch 'master'

We should use something other than:
        ctx.local('git fetch --prune')
        ctx.local('git reset FETCH_HEAD --hard')
        ctx.local('git checkout %s' % ref)

Comment 1

[Ed Morley [:emorley]]

Attachment: Deploy script fixes & cleanup

This includes fixes for bug 1059814, bug 1135798, bug 1088705 & bug 1138392.
Please see the individual commit diffs and multi-line commit messages for easier review :-)

Comment 2

[Kendall Libby [:fubar] (he/him)]

Comment on attachment 8571393 [details] [review]
Deploy script fixes & cleanup

lgtm!

Comment 3

[Treeherder GitHub Bugbot]

Commits pushed to master at https://github.com/mozilla/treeherder-service

https://github.com/mozilla/treeherder-service/commit/c3afe9584d93a7167caaa8ea3335d25970ab88f4
Bug 1135798 - Deploy script: Fix the git fetch/reset commands

The current fetch/reset/checkout doesn't correctly update the working
directory when switching between branches. This new approach is
recommended by:
http://stackoverflow.com/a/9589927

https://github.com/mozilla/treeherder-service/commit/d011d2f9bd2b6be3df57da34b3d1045fecaae92d
Bug 1135798 - Deploy script: Remove unnecessary submodule git commands

We don't use git submodules, so let's not bother trying to update them.

Comment 4

[Ed Morley [:emorley]]

Thanks for the review :-)