diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-01-28 13:40:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-28 13:40:40 +0000 |
| commit | ca18de924d974b813adb477eee407f746688b8a0 (patch) | |
| tree | beb3695b8ef7fc8e05a9eda3d7ddef08a70e0827 /jjb/functest | |
| parent | 141378f02bb7a1800f022b496e9280e0b5e66e5f (diff) | |
| parent | c191f55927899a0d436e5deaa723a18b894113dc (diff) | |
Merge "Usey latest tag in Functest jjob until release tag candidate is fixed"
Diffstat (limited to 'jjb/functest')
| -rw-r--r-- | jjb/functest/functest-ci-jobs.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index 2b91ed692..10ea72b53 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -243,13 +243,13 @@ sudo rm -rf ${dir_result}/* res_volume="-v ${dir_result}:/home/opnfv/functest/results" - docker pull opnfv/functest:latest_stable >$redirect - cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash" + docker pull opnfv/functest:latest >$redirect + cmd="sudo docker run --privileged=true -id ${envs} ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest /bin/bash" echo "Functest: Running docker run command: ${cmd}" ${cmd} docker ps -a sleep 5 - container_id=$(docker ps | grep 'opnfv/functest:latest_stable' | awk '{print $1}' | head -1) + container_id=$(docker ps | grep 'opnfv/functest:latest' | 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." @@ -260,7 +260,7 @@ docker start ${container_id} sleep 5 docker ps - if [ $(docker ps | grep 'opnfv/functest:latest_stable' | wc -l) == 0 ]; then + if [ $(docker ps | grep 'opnfv/functest:latest' | wc -l) == 0 ]; then echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..." exit 1 fi |