summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2015-12-02 14:32:49 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-12-02 14:32:49 +0000
commitf51d3ec38ee1660027d5a75cdaaceca707312fd4 (patch)
tree4e19041f7fb40f798ce653077d6073421c2952d8 /jjb
parent5fb00e7cce71dd8d5725cd21b59235ec16d6aeb1 (diff)
parent407e21ea49e365d4f7473c797b1b45ad4e893da8 (diff)
Merge "Retrieve latest_stable bugfix in Functest jenkins job"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest.yml6
1 files changed, 3 insertions, 3 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 17a6db85f..53da3eec5 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -477,10 +477,10 @@
envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}"
docker pull opnfv/functest:latest_stable
echo "Functest: Running docker run command: docker run -i -e $envs opnfv/functest /bin/bash &"
- docker run -i -e $envs opnfv/functest /bin/bash &
+ docker run -i -e $envs opnfv/functest:latest_stable /bin/bash &
docker ps -a
sleep 5
- container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
+ container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1)
echo "Container ID=${container_id}"
if [ -z ${container_id} ]; then
echo "Cannot find opnfv/functest container ID ${container_id}. Please check if it is existing."
@@ -491,7 +491,7 @@
docker start ${container_id}
sleep 5
docker ps
- if [ $(docker ps | grep opnfv/functest | wc -l) == 0 ]; then
+ if [ $(docker ps | grep 'opnfv/functest:latest_stable' | wc -l) == 0 ]; then
echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
exit 1
fi