summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-04-12 18:40:10 +0200
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-04-14 12:05:08 +0000
commit49b37a3df8a012f678dd5f1b7278e7218f734175 (patch)
tree2e6edd62418b43d52b55476328ba0c364805467e
parent55f52128fe9e71c37f22ae349a6ca1720cc1b736 (diff)
Fix TAG for Functest docker run command and avoid extra output
Change-Id: I8ab18f5a5871e8df51c70b4de4201bd7b514cdb2 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rw-r--r--jjb/functest/functest-ci-jobs.yml12
1 files changed, 7 insertions, 5 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index af79fbf75..74f00f836 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -270,10 +270,12 @@
sudo rm -rf ${dir_result}/*
res_volume="-v ${dir_result}:/home/opnfv/functest/results"
- docker pull opnfv/functest:$DOCKER_TAG >$redirect
- cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /bin/bash"
+ echo "Functest: Pulling image opnfv/functest:${DOCKER_TAG}"
+ docker pull opnfv/functest:$DOCKER_TAG >${redirect}
+
+ cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:${DOCKER_TAG} /bin/bash"
echo "Functest: Running docker run command: ${cmd}"
- ${cmd}
+ ${cmd} >${redirect}
docker ps -a
sleep 5
container_id=$(docker ps | grep 'opnfv/functest:latest' | awk '{print $1}' | head -1)
@@ -312,7 +314,7 @@
# Remove previous running containers if exist
if [[ ! -z $(docker ps -a | grep opnfv/functest) ]]; then
echo "Removing existing opnfv/functest containers..."
- docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >$redirect
+ docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f >${redirect}
fi
# Remove existing images if exist
@@ -322,6 +324,6 @@
image_tags=($(docker images | grep opnfv/functest | awk '{print $2}'))
for tag in "${image_tags[@]}"; do
echo "Removing docker image opnfv/functest:$tag..."
- docker rmi opnfv/functest:$tag >$redirect
+ docker rmi opnfv/functest:$tag >${redirect}
done
fi