From e6b9af00ac6571ddbfd91732379a5cafdf47c931 Mon Sep 17 00:00:00 2001 From: Dobroslaw Zybort Date: Mon, 21 Jan 2019 14:20:43 +0100 Subject: [PATCH] Use global job for building docker image Story: 2001694 Task: 24234 Change-Id: Ic84c66f239ae09e84eb76fb6a9385b7713876989 Depends-On: https://review.openstack.org/#/c/632087/ --- .zuul.yaml | 1 + docker/build_image.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/.zuul.yaml b/.zuul.yaml index 9fb5c108a..7eb969436 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -155,6 +155,7 @@ - monasca-tempest-python2-java-cassandra - monasca-tempest-python3-java-cassandra - monascalog-python3-tempest + - docker-build-monasca-service - legacy-monasca-api-maven-build: voting: false gate: diff --git a/docker/build_image.sh b/docker/build_image.sh index 1dccc4886..730c5eb59 100755 --- a/docker/build_image.sh +++ b/docker/build_image.sh @@ -44,6 +44,10 @@ set -eo pipefail # Exit the script if any statement returns error. # to provide it as in the following example: # $ ./build_image.sh master master refs/changes/19/595719/3 +# Go to folder with Docker files. +REAL_PATH=$(python -c "import os,sys; print(os.path.realpath('$0'))") +cd "$(dirname "$REAL_PATH")/../docker/" + [ -z "$DOCKER_IMAGE" ] && \ DOCKER_IMAGE=$(\grep DOCKER_IMAGE Dockerfile | cut -f2 -d"=")