diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2015-10-13 11:26:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-10-13 11:26:56 +0000 |
| commit | 6da587c008e0e51170c5f9c4bd936b5ea8492511 (patch) | |
| tree | e49eac7a381d8e04b048e4fa5ed6de654d218e2f /jjb | |
| parent | 2b1dda7443ae1f917542781444c25f92317471a4 (diff) | |
| parent | 356ddad3183693ab9b41e840f31d4681568c065e (diff) | |
Merge "Remove prepending dollar signs from commands from functest jjb"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/functest/functest.yml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 6268f27d2..efd6245e1 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -525,12 +525,12 @@ set +e # Remove any docker containers leftovers - $ docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null - $ docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null - $ docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null + docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null + docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null + docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null # Pull and store fresh image from Dockerhub - $ docker pull opnfv/functest + docker pull opnfv/functest # Run Docker and Functest tests cmd="${FUNCTEST_REPO_DIR}/docker/start.sh" @@ -632,7 +632,7 @@ set +e # cleanup: remove any docker containers leftovers - $ docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null - $ docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null - $ docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null + docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null + docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null + docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null |