diff options
Diffstat (limited to 'jjb/opnfv')
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 8 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.sh | 20 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docker.yml | 2 |
3 files changed, 11 insertions, 19 deletions
diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index aaa5d83b7..08f90c65c 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -78,18 +78,10 @@ default: joid description: 'Installer used for deploying OPNFV on this POD' - string: - name: SDN_CONTROLLER - default: 'nosdn' - description: 'SDN Controller to use' - - string: name: DEPLOY_SCENARIO default: 'none' description: 'Scenario to deploy and test' - string: - name: HA_MODE - default: 'ha' - description: 'High Availability mode (ha|nonha)' - - string: name: OS_RELEASE default: 'liberty' description: 'OpenStack release (kilo|liberty)' diff --git a/jjb/opnfv/opnfv-docker.sh b/jjb/opnfv/opnfv-docker.sh index 02ceecfd8..108485d0b 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 @@ -91,7 +91,7 @@ echo "Tag version to be build and pushed: $DOCKER_TAG" # Start the build echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG..." -docker build -t $DOCKER_REPO_NAME:$DOCKER_TAG . +docker build --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG . echo "Creating tag 'latest'..." docker tag $DOCKER_REPO_NAME:$DOCKER_TAG $DOCKER_REPO_NAME:latest 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: |