From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Thu, 14 Apr 2016 15:11:37 +0000 (+0200)
Subject: Fix Docker TAG in Functest job
X-Git-Tag: colorado.1.0~576
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4521d6c11c11bf23faa2f6bc5a8d2e65dc198a29;p=releng.git

Fix Docker TAG in Functest job

Change-Id: Id02ff937246c946372e00834b3accd80f760fef7
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index 74f00f836..cb9d28950 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -278,7 +278,7 @@
             ${cmd} >${redirect}
             docker ps -a
             sleep 5
-            container_id=$(docker ps | grep 'opnfv/functest:latest' | awk '{print $1}' | head -1)
+            container_id=$(docker ps | grep 'opnfv/functest:$DOCKER_TAG' | 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."
@@ -289,7 +289,7 @@
             docker start ${container_id}
             sleep 5
             docker ps
-            if [ $(docker ps | grep 'opnfv/functest:latest' | wc -l) == 0 ]; then
+            if [ $(docker ps | grep 'opnfv/functest:$DOCKER_TAG' | wc -l) == 0 ]; then
                 echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
                 exit 1
             fi