summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNauman_Ahad <Nauman_Ahad@dell.com>2016-01-13 02:16:27 +0500
committerFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-01-13 08:48:15 +0000
commit2f1a1ffb7c4ac41d4c99469db3cce64644272c9c (patch)
tree0a541940b9cbc6c2023773a1095d3a83f369051a
parentf90cb467e052a29e46031bc266a6054d33b1daac (diff)
Bug fixes for QTIP Jenkins Job
Bugs in qtip-cleanup and qtip-run-suite builders. Spaces removed in qtip-cleanup builder to ensure variables take the given values. container_id again redeclared and echoed in qtip-run-suite for debugging. Change-Id: I608001fbc91d34870debe2cd620d9a5e19e82dd6 Signed-off-by: Nauman_Ahad <Nauman_Ahad@dell.com>
-rw-r--r--jjb/qtip/qtip.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/jjb/qtip/qtip.yml b/jjb/qtip/qtip.yml
index c442c6cd9..1f761dec0 100644
--- a/jjb/qtip/qtip.yml
+++ b/jjb/qtip/qtip.yml
@@ -136,7 +136,10 @@
name: qtip-run-suite
builders:
- shell: |
- #!/bin/bash
+ #!/bin/basih
+ echo "The container id is:"
+ container_id=$(docker ps | grep 'opnfv/qtip:latest' | awk '{print $1}' | head -1)
+ echo $container_id
QTIP_REPO=/home/opnfv/repos/qtip
docker exec -t ${container_id} $QTIP_REPO/docker/run_qtip.sh
@@ -151,9 +154,9 @@
# Remove previous running containers if exist
if [[ ! -z $(docker ps -a | grep opnfv/qtip) ]]; then
echo "Removing existing opnfv/qtip containers..."
- running_containers= $(docker ps | grep opnfv/qtip | awk '{print $1}')
+ running_containers=$(docker ps | grep opnfv/qtip | awk '{print $1}')
docker stop ${running_containers}
- all_containers= $(docker ps -a | grep opnfv/qtip | awk '{print $1}')
+ all_containers=$(docker ps -a | grep opnfv/qtip | awk '{print $1}')
docker rm ${all_containers}
fi