summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-01-13 13:31:43 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-13 13:31:43 +0000
commit2a315ee3d2523b55618e93c0ba546b7b28cdddf9 (patch)
treed1f7f4c0690e1db8017cc47ca013440c3078c76b
parent2f1a1ffb7c4ac41d4c99469db3cce64644272c9c (diff)
parent3c94720422dfe1a76a6b1342bfd30a42a90c08ce (diff)
Merge "test: Remove escape characters from docker job"
-rw-r--r--jjb/opnfv/opnfv-docker.sh18
-rw-r--r--jjb/opnfv/opnfv-docker.yml2
2 files changed, 10 insertions, 10 deletions
diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh
index 02ceecfd8..a18ad0f89 100644
--- a/jjb/opnfv/opnfv-docker.sh
+++ b/jjb/opnfv/opnfv-docker.sh
@@ -12,12 +12,12 @@ echo
# Remove previous running containers if exist
if [[ ! -z $(docker ps -a | grep $DOCKER_REPO_NAME) ]]; then
echo "Removing existing $DOCKER_REPO_NAME containers..."
- #docker ps | grep $DOCKER_REPO_NAME | awk '{{print $1}}' | xargs docker stop
- docker ps -a | grep $DOCKER_REPO_NAME | awk '{{print $1}}' | xargs docker rm -f
+ #docker ps | grep $DOCKER_REPO_NAME | awk '{print $1}' | xargs docker stop
+ docker ps -a | grep $DOCKER_REPO_NAME | awk '{print $1}' | xargs docker rm -f
t=60
# Wait max 60 sec for containers to be removed
- while [ $t -gt 0 ]; do
- ids=$(docker ps | grep $DOCKER_REPO_NAME |awk '{{print $1}}')
+ while [[ $t -gt 0 ]]; do
+ ids=$(docker ps | grep $DOCKER_REPO_NAME |awk '{print $1}')
if [[ -z $ids ]]; then
break
fi
@@ -31,8 +31,8 @@ fi
if [[ ! -z $(docker images | grep $DOCKER_REPO_NAME) ]]; then
echo "Docker images to remove:"
docker images | head -1 && docker images | grep $DOCKER_REPO_NAME
- image_tags=($(docker images | grep $DOCKER_REPO_NAME | awk '{{print $2}}'))
- for tag in "${{image_tags[@]}}"; do
+ image_tags=($(docker images | grep $DOCKER_REPO_NAME | awk '{print $2}'))
+ for tag in "${image_tags[@]}"; do
echo "Removing docker image $DOCKER_REPO_NAME:$tag..."
docker rmi -f $DOCKER_REPO_NAME:$tag
done
@@ -68,10 +68,10 @@ else
fi
# Get tag version
-branch=$(git rev-parse --abbrev-ref HEAD)
+branch="${GIT_BRANCH##origin/}"
echo "Current branch: $branch"
-if [ $branch == "master" ]; then
+if [[ "$branch" == "master" ]]; then
DOCKER_TAG="master"
else
git clone https://gerrit.opnfv.org/gerrit/releng $WORKSPACE/releng
@@ -80,7 +80,7 @@ else
-n $DOCKER_REPO_NAME)
ret_val=$?
- if [ $ret_val -ne 0 ]; then
+ if [[ $ret_val -ne 0 ]]; then
echo "Error retrieving the version tag."
exit 1
fi
diff --git a/jjb/opnfv/opnfv-docker.yml b/jjb/opnfv/opnfv-docker.yml
index 54ebea6f9..c16e33eda 100644
--- a/jjb/opnfv/opnfv-docker.yml
+++ b/jjb/opnfv/opnfv-docker.yml
@@ -66,7 +66,7 @@
builders:
- shell:
- !include-raw ./opnfv-docker.sh
+ !include-raw-escape: ./opnfv-docker.sh
triggers:
- pollscm: