Merge "create deployment jobs of openstack+odl and openstack_onos"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 3893478..30dfcda 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -189,7 +189,6 @@
     builders:
         - 'apex-build'
         - 'apex-upload-artifact'
-        - 'apex-workspace-cleanup'
         - 'apex-deploy-virtual'
         - 'apex-workspace-cleanup'
 

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index 92afa7d..e300dd1 100644 (file)
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -646,7 +646,8 @@
             set +e
 
             # cleanup: remove any docker containers leftovers
-            docker ps | grep opnfv/functest | awk '{print $1}' | xargs docker stop &>/dev/null
-            docker ps -a | grep opnfv/functest | awk '{print $1}' | xargs docker rm &>/dev/null
-            docker images | grep opnfv/functest | awk '{print $3}' | xargs docker rmi &>/dev/null
+            echo "Removing the docker container..."
+            docker rm -f $(docker ps | grep opnfv/functest | awk '{print $1}')
+            echo "Removing the docker image..."
+            docker rmi -f $(docker images | grep opnfv/functest | awk '{print $3}')