summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--newton/docker/build_image.sh4
-rw-r--r--newton/pom.xml6
-rw-r--r--ocata/docker/build_image.sh4
-rw-r--r--ocata/ocata/settings.py5
-rw-r--r--ocata/pom.xml6
-rw-r--r--pom.xml15
-rw-r--r--windriver/docker/build_image.sh4
-rw-r--r--windriver/pom.xml6
-rw-r--r--windriver/titanium_cloud/settings.py5
9 files changed, 48 insertions, 7 deletions
diff --git a/newton/docker/build_image.sh b/newton/docker/build_image.sh
index fd8fb8cd..203283d1 100644
--- a/newton/docker/build_image.sh
+++ b/newton/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-newton"
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/newton/pom.xml b/newton/pom.xml
index 555f3b53..ceff90cc 100644
--- a/newton/pom.xml
+++ b/newton/pom.xml
@@ -28,6 +28,12 @@
<packaging>pom</packaging>
<name>multicloud/openstack/newton</name>
<description>multicloud for openstack newton</description>
+ <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/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
index b0d72264..e8bfdf2c 100644
--- a/ocata/docker/build_image.sh
+++ b/ocata/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-ocata"
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/ocata/ocata/settings.py b/ocata/ocata/settings.py
index 1e8473b7..3cc4caa9 100644
--- a/ocata/ocata/settings.py
+++ b/ocata/ocata/settings.py
@@ -99,6 +99,11 @@ LOGGING = {
'level': 'DEBUG',
'propagate': False
},
+ 'newton': {
+ 'handlers': ['ocata_handler'],
+ 'level': 'DEBUG',
+ 'propagate': False
+ },
}
}
diff --git a/ocata/pom.xml b/ocata/pom.xml
index bd703378..58179fd9 100644
--- a/ocata/pom.xml
+++ b/ocata/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/pom.xml b/pom.xml
index ccfb334f..463b4a08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,14 @@
<version>1.0.0-SNAPSHOT</version>
<name>multicloud-openstack</name>
<packaging>pom</packaging>
-
+ <description>multicloud openstack</description>
+ <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>
+
<modules>
<module>newton</module>
<module>ocata</module>
@@ -57,15 +64,15 @@
<source>1.8</source>
<target>1.8</target>
</configuration>
- </plugin>
- <plugin>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.7</version>
<configuration>
<retryFailedDeploymentCount>2</retryFailedDeploymentCount>
</configuration>
- </plugin>
+ </plugin>
</plugins>
</build>
</project>
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
+ },
}
}