]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
nuke.py: remove trailing fi token 876/head
authorPatrick Donnelly <batrick@batbytes.com>
Fri, 10 Jun 2016 19:53:01 +0000 (15:53 -0400)
committerPatrick Donnelly <batrick@batbytes.com>
Fri, 10 Jun 2016 19:54:00 +0000 (15:54 -0400)
This caused a syntax error in one of the teuthology runs:

    2016-06-10T02:30:39.291 INFO:teuthology.nuke:clearing kernel mount from all nodes
    2016-06-10T02:30:39.292 INFO:teuthology.orchestra.run:Running command with timeout 60
    2016-06-10T02:30:39.292 INFO:teuthology.orchestra.run.mira069:Running: "grep ceph /etc/mtab | grep -o 'on /.* type' | grep -o '/.* ' | xargs -r sudo umount -f ; fi"
    2016-06-10T02:30:39.363 INFO:teuthology.orchestra.run.mira069.stderr:bash: -c: line 0: syntax error near unexpected token `fi'
    2016-06-10T02:30:39.364 INFO:teuthology.orchestra.run.mira069.stderr:bash: -c: line 0: `grep ceph /etc/mtab | grep -o 'on /.* type' | grep -o '/.* ' | xargs -r sudo umount -f ; fi'

Signed-off-by: Patrick Donnelly <batrick@batbytes.com>
teuthology/nuke.py

index c8abf21f3eaa7b93dde514a07becaab947a5efd8..24cbb62ea662323e3e12b2d331d5e1d5d5871d93 100644 (file)
@@ -113,7 +113,6 @@ def remove_kernel_mounts(ctx):
                 'grep', '-o', "/.* ", run.Raw('|'),
                 'xargs', '-r',
                 'sudo', 'umount', '-f', run.Raw(';'),
-                'fi'
             ],
             check_status=False,
             timeout=60