Fix project environment

The PROJECT environment seems to be provided by Jenkins job, as
result that the default "openstack" value is used during the creation
of the image. This behaviour causes different names. This change
fixes the default value for the PROJECT enviroment variable.

Change-Id: Ice521ecf58b4fe111553561e60dae92172248025
Signed-off-by: Victor Morales <victor.morales@intel.com>
Issue-ID: MULTICLOUD-242

diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
old mode 100644 (file)
new mode 100755 (executable)
index 03b1121..980dffc
--- a/ocata/docker/build_image.sh
+++ b/ocata/docker/build_image.sh
@@ -7,7 +7,8 @@ cd ${DOCKER_BUILD_DIR}
 BUILD_ARGS="--no-cache"
 VERSION="1.2.0-SNAPSHOT"
 STAGING="1.2.0-STAGING"
-IMAGE_NAME="${DOCKER_REPOSITORY:-"nexus3.onap.org:10003"}/${ORG:-"onap"}/${PROJECT:-"multicloud"}/${IMAGE:-"openstack-ocata"}"
+OS_VERSION="ocata"
+IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
 
 if [ $HTTP_PROXY ]; then
     BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}"