Update git submodules
authorAric Gardner <agardner@linuxfoundation.org>
Thu, 14 Sep 2017 16:54:50 +0000 (16:54 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 14 Sep 2017 16:54:50 +0000 (16:54 +0000)
commita2e79b69295d528c9c587523ea803b5834471295
tree2536da72fe8286c8e549854dc1fe69f96477f876
parent91f92fb51ea7cca064a3b31d4a4921f615da6271
Update git submodules

* Update docs/submodules/releng from branch 'master'
  - Merge "yardstick-cleanup.sh: try to fix docker rmi failure"
  - yardstick-cleanup.sh: try to fix docker rmi failure

    apex builds seem to be failing to remove the yardstick
    containers

    https://build.opnfv.org/ci/job/yardstick-apex-baremetal-daily-master/400/console

    [yardstick-apex-baremetal-daily-master] $ /bin/bash /tmp/hudson8974425724638109512.sh
    Cleaning up docker containers/images...
    Docker images to remove:
    REPOSITORY                   TAG                 IMAGE ID            CREATED             SIZE
    opnfv/yardstick              latest              5b83d8e60fb7        6 days ago          1.84GB
    Removing docker image opnfv/yardstick:latest...
    Error response from daemon: No such image: opnfv/yardstick:latest
    Build step 'Execute shell' marked build as failure

    For some reason we can't remove the yardstick container.

    Try instead to remove based on ID

    Replace grep | awk with just awk.

    Also fixed shellcheck warnings:

    In jjb/yardstick/yardstick-cleanup.sh line 6:
    if [[ -n ${dangling_images} ]]; then
             ^-- SC2128: Expanding an array without an index only gives the first element.

    In jjb/yardstick/yardstick-cleanup.sh line 10:
            containers=$(docker ps -a | grep $image_id | awk '{print $1}')
                                             ^-- SC2086: Double quote to prevent globbing and word splitting.

    In jjb/yardstick/yardstick-cleanup.sh line 12:
                docker rm -f $containers >${redirect}
                             ^-- SC2086: Double quote to prevent globbing and word splitting.

    In jjb/yardstick/yardstick-cleanup.sh line 14:
            docker rmi $image_id >${redirect}
                       ^-- SC2086: Double quote to prevent globbing and word splitting.

    In jjb/yardstick/yardstick-cleanup.sh line 20:
    if [[ ! -z $(docker ps -a | grep opnfv/yardstick) ]]; then
            ^-- SC2143: Use ! grep -q instead of comparing output with [ -z .. ].

    In jjb/yardstick/yardstick-cleanup.sh line 27:
    if [[ ! -z $(docker images | grep opnfv/yardstick) ]]; then
            ^-- SC2143: Use ! grep -q instead of comparing output with [ -z .. ].

    In jjb/yardstick/yardstick-cleanup.sh line 33:
            docker rmi opnfv/yardstick:$tag >$redirect
                                       ^-- SC2086: Double quote to prevent globbing and word splitting.

    Change-Id: I6545ac7f568161e5620e31d487faf70fa21da075
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
docs/submodules/releng