summaryrefslogtreecommitdiffstats
path: root/ocata
diff options
context:
space:
mode:
authorBin Yang <bin.yang@windriver.com>2019-07-11 04:09:29 +0000
committerBin Yang <bin.yang@windriver.com>2019-07-11 04:09:29 +0000
commit463eb41dc371cc857d058b0ae22bdeab64f1f7e3 (patch)
tree7e23e9bd180e4e3a61d4e386e1654cd0babd76ca /ocata
parent4070f8e43807f5c1746b5942b288c2ee99ad23f7 (diff)
Bump up version for E Release
Change from 1.3.5 to 1.4.0 Change-Id: I91e1e5ffa95b54b6650d7b895ea5daf1590217dc Issue-ID: MULTICLOUD-700 Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'ocata')
-rw-r--r--ocata/docker/Dockerfile2
-rwxr-xr-xocata/docker/build_image.sh4
-rw-r--r--ocata/pom.xml9
3 files changed, 7 insertions, 8 deletions
diff --git a/ocata/docker/Dockerfile b/ocata/docker/Dockerfile
index be2e3568..9c423d57 100644
--- a/ocata/docker/Dockerfile
+++ b/ocata/docker/Dockerfile
@@ -36,7 +36,7 @@ RUN groupadd -r onap && useradd -r -g onap onap
RUN apt-get update && \
apt-get install -y memcached wget unzip gcc libssl-dev && \
cd /opt/ && \
- wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=1.3.5-SNAPSHOT" && \
+ wget -O /opt/multicloud-openstack-ocata.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack&a=multicloud-openstack-ocata&e=zip&v=1.4.0-SNAPSHOT" && \
unzip -q -o -B /opt/multicloud-openstack-ocata.zip -d /opt/ && \
rm -f /opt/multicloud-openstack-ocata.zip && \
pip install -r /opt/ocata/requirements.txt && \
diff --git a/ocata/docker/build_image.sh b/ocata/docker/build_image.sh
index 5c74e307..f93a63e8 100755
--- a/ocata/docker/build_image.sh
+++ b/ocata/docker/build_image.sh
@@ -19,8 +19,8 @@ echo "DOCKER_BUILD_DIR=${DOCKER_BUILD_DIR}"
cd ${DOCKER_BUILD_DIR}
BUILD_ARGS="--no-cache"
-VERSION="1.3.5-SNAPSHOT"
-STAGING="1.3.5-STAGING"
+VERSION="1.4.0-SNAPSHOT"
+STAGING="1.4.0-STAGING"
OS_VERSION="ocata"
IMAGE_NAME="nexus3.onap.org:10003/onap/multicloud/openstack-${OS_VERSION}"
diff --git a/ocata/pom.xml b/ocata/pom.xml
index d40f6da5..6ff8c8b0 100644
--- a/ocata/pom.xml
+++ b/ocata/pom.xml
@@ -16,15 +16,14 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>oparent</artifactId>
- <version>2.0.0</version>
- <relativePath>../oparent</relativePath>
+ <groupId>org.onap.multicloud.openstack</groupId>
+ <artifactId>multicloud-openstack-root</artifactId>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.onap.multicloud.openstack</groupId>
<artifactId>multicloud-openstack-ocata</artifactId>
- <version>1.3.5-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>multicloud-openstack-ocata</name>
<description>multicloud for openstack ocata</description>