From: Victor Morales <victor.morales@intel.com>
Date: Wed, 6 Jun 2018 16:00:44 +0000 (-0700)
Subject: Fix project environment
X-Git-Tag: 1.2.0~112
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=079a1b8de9153bd63d95b807456149f49f3a7b66;p=multicloud%2Fopenstack.git

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
new mode 100755
index 03b11212..980dffc7
--- 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}"