kernel: reset to remote firmware branch; don't pull

Pull might merge if upstream rebases.  Just make our branch match the
remote one.

diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py
index 6f3bb34b5a5d6d651daabb9bbf72921acfc544fc..e2a560e26cb375609eab78edb7033ad5f3645594 100644 (file)
--- a/teuthology/task/kernel.py
+++ b/teuthology/task/kernel.py
@@ -121,7 +121,9 @@ def install_firmware(ctx, config):
             args=[
                 'cd', fw_dir,
                 run.Raw('&&'),
-                'sudo', 'git', 'pull', 'origin', 'master'
+                'sudo', 'git', 'fetch', 'origin',
+                run.Raw('&&'),
+                'sudo', 'git', 'reset', '--hard', 'origin/master'
                 ],
             )