diff options
| author | cpilch <cpilch@google.com> | 2017-03-30 15:04:34 -0700 |
|---|---|---|
| committer | cpilch <cpilch@google.com> | 2017-03-30 15:04:34 -0700 |
| commit | 0254b1cc2042be54915621fc50d5972aeb86e722 (patch) | |
| tree | b6a9fd70a8c242956d555f71a0a2689e9cdea59d | |
| parent | c9564922ed6ef96c8aeba2583a7f67d4bda7b34b (diff) | |
| download | adt-infra-0254b1cc2042be54915621fc50d5972aeb86e722.tar.gz | |
Adds a checkout command to annotated_run.py
To ease the transition into our new adt-infra branch, we will use the
annotated run script to accomplish this for us on our bots. Any bot on
the master ('old') branch will move to the new emu-master-dev branch
once a new build is kicked off.
Change-Id: I3130d97db7d2318091d8656ff8d6958c512df27b
| -rwxr-xr-x | build/scripts/slave/annotated_run.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/build/scripts/slave/annotated_run.py b/build/scripts/slave/annotated_run.py index b1ab163b..b51b2bb0 100755 --- a/build/scripts/slave/annotated_run.py +++ b/build/scripts/slave/annotated_run.py @@ -182,8 +182,9 @@ def update_scripts(): git_cmd = 'git.bat' if os.name == "nt" else 'git' with stream.step('update_scripts') as s: fetch_cmd = [git_cmd, 'fetch', '--all'] - reset_cmd = [git_cmd, 'reset', '--hard', 'origin/master'] - if subprocess.call(fetch_cmd) != 0 or subprocess.call(reset_cmd) != 0: + reset_cmd = [git_cmd, 'reset', '--hard', 'origin/emu-master-dev'] + checkout_cmd = [git_cmd, 'checkout', 'emu-master-dev'] + if subprocess.call(fetch_cmd) != 0 or subprocess.call(reset_cmd) != 0 or subprocess.call(checkout_cmd) != 0: s.step_text('git update source failed!') s.step_warnings() s.step_text('git pull') |