From 32a106d589916760dd2232c6a8570aa57c0ee893 Mon Sep 17 00:00:00 2001
From: Bin Yang <bin.yang@windriver.com>
Date: Wed, 11 Oct 2017 16:19:45 +0800
Subject: Add staging docker images for OpenStack plugins

Add staging docker images and enable logger of submodules

Change-Id: Ib64f30ab50002dca67c6835866ffc46fc83d7934
Issue-Id: MULTICLOUD-110
Signed-off-by: Bin Yang <bin.yang@windriver.com>
---
 windriver/docker/build_image.sh      | 4 +++-
 windriver/pom.xml                    | 6 ++++++
 windriver/titanium_cloud/settings.py | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'windriver')

diff --git a/windriver/docker/build_image.sh b/windriver/docker/build_image.sh
index cc32212e..85e80c22 100644
--- a/windriver/docker/build_image.sh
+++ b/windriver/docker/build_image.sh
@@ -7,6 +7,7 @@ cd ${DOCKER_BUILD_DIR}
 BUILD_ARGS="--no-cache"
 ORG="onap"
 VERSION="1.0.0-SNAPSHOT"
+STAGING="1.0.0-STAGING"
 PROJECT="multicloud"
 IMAGE="openstack-windriver"
 DOCKER_REPOSITORY="nexus3.onap.org:10003"
@@ -20,12 +21,13 @@ if [ $HTTPS_PROXY ]; then
 fi
 
 function build_image {
-    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest .
+    docker build ${BUILD_ARGS} -t ${IMAGE_NAME}:${VERSION} -t ${IMAGE_NAME}:latest -t ${IMAGE_NAME}:${STAGING} .
 }
 
 function push_image {
     docker push ${IMAGE_NAME}:${VERSION}
     docker push ${IMAGE_NAME}:latest
+    docker push ${IMAGE_NAME}:${STAGING}
 }
 
 build_image
diff --git a/windriver/pom.xml b/windriver/pom.xml
index 6e6c9d00..9e468219 100644
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -33,6 +33,12 @@
             <type>zip</type>
         </dependency>
     </dependencies>
+    <properties>
+        <encoding>UTF-8</encoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+    </properties>
     <build>
       <plugins>
         <plugin>
diff --git a/windriver/titanium_cloud/settings.py b/windriver/titanium_cloud/settings.py
index 393f994e..8d2684e7 100644
--- a/windriver/titanium_cloud/settings.py
+++ b/windriver/titanium_cloud/settings.py
@@ -99,6 +99,11 @@ LOGGING = {
             'level': 'DEBUG',
             'propagate': False
         },
+        'newton': {
+            'handlers': ['titanium_cloud_handler'],
+            'level': 'DEBUG',
+            'propagate': False
+        },
     }
 }
 
-- 
cgit 1.2.3-korg