From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Fri, 20 Nov 2015 13:45:40 +0000 (+0100)
Subject: Adapt Functest job to pull latest_stable docker tag
X-Git-Tag: test-tag~194
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7a2a2386c6d7de8802daf0c2a63039b7e3c8fda4;p=releng.git

Adapt Functest job to pull latest_stable docker tag

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

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 598bcf2a5..f2b02cc45 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -226,10 +226,10 @@
         artifactNumToKeep: -1
 
     builders:
+        - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-all'
         - 'functest-store-results'
-        - 'functest-cleanup'
 
 - job-template:
     name: functest-{installer}-{stream}
@@ -271,10 +271,10 @@
         artifactNumToKeep: -1
 
     builders:
+        - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-all'
         - 'functest-store-results'
-        - 'functest-cleanup'
 
 - job-template:
     name: functest-vims-{installer}-{stream}
@@ -541,7 +541,6 @@
 
             echo "Functest: Start Docker and prepare environment"
             envs="INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP}"
-            docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm -f &>/dev/null
             docker pull opnfv/functest
             echo "Functest: Running docker run command: docker run -i -e $envs opnfv/functest /bin/bash &"
             docker run -i -e $envs opnfv/functest /bin/bash &
@@ -647,8 +646,7 @@
             set +e
 
             # cleanup: remove any docker containers leftovers
-            echo "Removing the docker container..."
+            echo "Removing existing Functest Docker containers..."
             docker rm -f $(docker ps | grep opnfv/functest | awk '{print $1}')
-            echo "Removing the docker image..."
+            echo "Removing existing Functest Docker image..."
             docker rmi -f $(docker images | grep opnfv/functest | awk '{print $3}')
-